hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 19:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-3422 change assetId

Browse Source
This commit is contained in:
aynsix
2021-04-26 11:59:51 +03:00
parent 61e3c71d4f
commit 2340fd6a39
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Alchemy/Phrasea/PhraseanetService/Controller/PSAdminController.php
View File

@@ -30,6 +30,15 @@ class PSAdminController extends Controller
if ($form->isValid()) { if ($form->isValid()) {
$app['conf']->set(['phraseanet-service', 'expose-service'], $form->getData()); $app['conf']->set(['phraseanet-service', 'expose-service'], $form->getData());
// generate a uniq key between phraseanet service and the phraseanet instance if not exist
if(!$app['conf']->has(['phraseanet-service', 'phraseanet_local_key'])) {
$instanceKey = $this->app['conf']->get(['main', 'key']);
$phraseanetLocalKey = md5($instanceKey);
$app['conf']->set(['phraseanet-service', 'phraseanet_local_key'], $phraseanetLocalKey);
}
return $app->redirectPath('ps_admin'); return $app->redirectPath('ps_admin');
} }

6
lib/Alchemy/Phrasea/WorkerManager/Worker/ExposeUploadWorker.php
View File

@@ -126,11 +126,11 @@ class ExposeUploadWorker implements WorkerInterface
} }
} }
$instanceKey = $this->app['conf']->get(['main', 'key']); $phraseanetLocalKey = $this->app['conf']->get(['phraseanet-service', 'phraseanet_local_key']);
// this is the unique reference for record in phraseanet and assets in expose // this is the unique reference for record in phraseanet and assets in expose
// instanceKey_basedID_record_id // phraseanetLocalKey_basedID_record_id
$assetId = $instanceKey.'_'.$record->getId(); $assetId = $phraseanetLocalKey.'_'.$record->getId();
$requestBody = [ $requestBody = [
'publication_id' => $payload['publicationId'], 'publication_id' => $payload['publicationId'],