diff --git a/config/configuration.sample.yml b/config/configuration.sample.yml index 3d0f1cc43e..70980b98ef 100644 --- a/config/configuration.sample.yml +++ b/config/configuration.sample.yml @@ -344,7 +344,6 @@ workers: ttl_delayed: 10000 # overwrite 5000 ms default delay pullAssets: ttl_retry: 5000 - max_retry : 5 webhook: timeout: 30 verify_ssl: true @@ -362,3 +361,13 @@ user_account: email_confirmation: true Console_logger_enabled_environments: [test] + +phraseanet-service: + uploader-service: + push_verify_ssl: true + pulled_target: + pull-test-local: + pullmodeUri: 'https://api-uploader.phrasea.local/commits?target=bdb5b019-340b-4c96-892c-d07deba5a425' + clientSecret: 239zb7mhzmu8cgg48cgok8ww4ccokw0ck8kwow4ggw80s84koc + clientId: pull-local-test_3pj0iu + verify_ssl: true diff --git a/docker-compose.under-phrasea.yml b/docker-compose.under-phrasea.yml index 65e63b90bf..363e22e87b 100644 --- a/docker-compose.under-phrasea.yml +++ b/docker-compose.under-phrasea.yml @@ -18,12 +18,15 @@ services: phraseanet: extra_hosts: - - minio.${PHRASEA_DOMAIN}:${PHRASEA_GATEWAY_IP} - api-databox.${PHRASEA_DOMAIN}:${PHRASEA_GATEWAY_IP} + - api-uploader.${PHRASEA_DOMAIN}:${PHRASEA_GATEWAY_IP} - databox-indexer.${PHRASEA_DOMAIN}:${PHRASEA_GATEWAY_IP} + - minio.${PHRASEA_DOMAIN}:${PHRASEA_GATEWAY_IP} - phraseanet.${PHRASEA_DOMAIN}:${PHRASEA_GATEWAY_IP} worker: extra_hosts: - - minio.${PHRASEA_DOMAIN}:${PHRASEA_GATEWAY_IP} - api-databox.${PHRASEA_DOMAIN}:${PHRASEA_GATEWAY_IP} + - api-uploader.${PHRASEA_DOMAIN}:${PHRASEA_GATEWAY_IP} + - databox-indexer.${PHRASEA_DOMAIN}:${PHRASEA_GATEWAY_IP} + - minio.${PHRASEA_DOMAIN}:${PHRASEA_GATEWAY_IP} diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index 7e3511e1f7..1b4a0dd1e9 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -17,7 +17,7 @@ class Version * @var string */ - private $number = '4.1.6-rc4'; + private $number = '4.1.6-rc5'; /** * @var string diff --git a/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php index 8ee6462c2a..69e0d0759b 100644 --- a/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php +++ b/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php @@ -430,29 +430,6 @@ class WorkerRunningJobRepository extends EntityRepository return $q->getResult(); } - /** - * @param $commitId - * @return bool - */ - public function canAckUploader($commitId) - { - $qb = $this->createQueryBuilder('w'); - $res = $qb - ->where('w.commitId = :commitId') - ->andWhere('w.work = :work') - ->andWhere('w.status != :status') - ->setParameters([ - 'commitId' => $commitId, - 'work' => MessagePublisher::ASSETS_INGEST_TYPE, - 'status' => WorkerRunningJob::FINISHED - ]) - ->getQuery() - ->getResult() - ; - - return count($res) == 0; - } - public function truncateWorkerTable() { $connection = $this->_em->getConnection(); diff --git a/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSAdminController.php b/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSAdminController.php index f871397738..f6d8d5be81 100644 --- a/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSAdminController.php +++ b/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSAdminController.php @@ -5,13 +5,18 @@ namespace Alchemy\Phrasea\PhraseanetService\Controller; use Alchemy\Phrasea\Application as PhraseaApplication; use Alchemy\Phrasea\Controller\Controller; use Alchemy\Phrasea\PhraseanetService\Form\PSExposeConfigurationType; +use Alchemy\Phrasea\PhraseanetService\Form\PSUploaderConfigurationType; +use Alchemy\Phrasea\WorkerManager\Queue\AMQPConnection; +use Alchemy\Phrasea\WorkerManager\Queue\MessagePublisher; use Symfony\Component\HttpFoundation\Request; class PSAdminController extends Controller { - public function indexAction(PhraseaApplication $app) + public function indexAction(PhraseaApplication $app, Request $request) { - return $this->render('admin/phraseanet-service/index.html.twig'); + return $this->render('admin/phraseanet-service/index.html.twig', [ + '_fragment'=> $request->get('_fragment') ?? 'expose' + ]); } public function authAction() @@ -39,7 +44,7 @@ class PSAdminController extends Controller $app['conf']->set(['phraseanet-service', 'phraseanet_local_id'], $phraseanetLocalId); } - return $app->redirectPath('ps_admin'); + return $app->redirectPath('ps_admin', ['_fragment'=>'expose']); } return $this->render('admin/phraseanet-service/expose.html.twig', [ @@ -57,8 +62,81 @@ class PSAdminController extends Controller return $this->render('admin/phraseanet-service/report.html.twig'); } - public function uploaderAction() + public function uploaderAction(PhraseaApplication $app, Request $request) { - return $this->render('admin/phraseanet-service/uploader.html.twig'); + $uploaderConfiguration = $app['conf']->get(['phraseanet-service', 'uploader-service'], null); + // the "pullInterval" comes from the ttl_retry + $ttl_retry = $this->getConf()->get(['workers','queues', MessagePublisher::PULL_ASSETS_TYPE, 'ttl_retry'], null); + if(!is_null($ttl_retry)) { + $ttl_retry /= 1000; // form is in sec + } + $uploaderConfiguration['pullInterval'] = $ttl_retry; + + $form = $app->form(new PSUploaderConfigurationType(), $uploaderConfiguration); + + $form->handleRequest($request); + + if ($form->isSubmitted() && $form->isValid()) { + $data = $form->getData(); + switch($data['act']) { + case 'save' : // save the form content (settings) in 2 places + $ttl_retry = $data['pullInterval']; + unset($data['act'], $data['pullInterval']); + $this->getConf()->set(['phraseanet-service', 'uploader-service'], $data); + + // save ttl in the q settings + if(!is_null($ttl_retry)) { + $this->getConf()->set(['workers','queues', MessagePublisher::PULL_ASSETS_TYPE, 'ttl_retry'], 1000 * (int)$ttl_retry); + } + $this->getAMQPConnection()->reinitializeQueue([MessagePublisher::PULL_ASSETS_TYPE]); + + break; + case 'start': + $this->getAMQPConnection()->setQueue(MessagePublisher::PULL_ASSETS_TYPE); + $this->getAMQPConnection()->reinitializeQueue([MessagePublisher::PULL_ASSETS_TYPE]); + $this->getMessagePublisher()->initializeLoopQueue(MessagePublisher::PULL_ASSETS_TYPE); + + break; + case 'stop': + $this->getAMQPConnection()->reinitializeQueue([MessagePublisher::PULL_ASSETS_TYPE]); + + break; + } + + return $app->redirectPath('ps_admin', ['_fragment'=>'uploader']); + } + + // guess if the q is "running" = check if there are pending message on Q or loop-Q + $running = false; + $qStatuses = $this->getAMQPConnection()->getQueuesStatus(); + foreach([ + MessagePublisher::PULL_ASSETS_TYPE, + $this->getAMQPConnection()->getLoopQueueName(MessagePublisher::PULL_ASSETS_TYPE) + ] as $qName) { + if(isset($qStatuses[$qName]) && $qStatuses[$qName]['messageCount'] > 0) { + $running = true; + } + } + + return $this->render('admin/phraseanet-service/uploader.html.twig', [ + 'form' => $form->createView(), + 'running' => $running + ]); + } + + /** + * @return AMQPConnection + */ + private function getAMQPConnection() + { + return $this->app['alchemy_worker.amqp.connection']; + } + + /** + * @return MessagePublisher + */ + private function getMessagePublisher() + { + return $this->app['alchemy_worker.message.publisher']; } } diff --git a/lib/Alchemy/Phrasea/PhraseanetService/Form/PSUploaderConfigurationType.php b/lib/Alchemy/Phrasea/PhraseanetService/Form/PSUploaderConfigurationType.php new file mode 100644 index 0000000000..96b865ef89 --- /dev/null +++ b/lib/Alchemy/Phrasea/PhraseanetService/Form/PSUploaderConfigurationType.php @@ -0,0 +1,124 @@ +add('act', HiddenType::class, [ + 'attr' => [ + 'class' => 'act' + ] + ]); + + $builder + ->add('push_verify_ssl', CheckboxType::class, [ + 'label' => 'admin:phrasea-service-setting:tab:uploader:: push verify_ssl', + 'required' => false, + 'attr' => [ + 'class' => '', + ] + ]) + ->add('pullInterval', IntegerType::class, [ + 'label' => 'admin:phrasea-service-setting:tab:uploader:: Fetching interval in second', + 'attr' => [ + 'placeholder' => 60, + ] + ]) + ->add('pulled_target', CollectionType::class, [ + 'label' => false, + 'entry_type' => PSUploaderPullType::class, + 'prototype' => true, + 'allow_add' => true, + 'allow_delete' => true, + ]) + ->setDataMapper($this) + ; + } + + /** + * @inheritDoc + */ + public function mapDataToForms($data, $forms) + { + // there is no data yet, so nothing to prepopulate + if ($data === null) { + return; + } + + /** @var FormInterface[] $forms */ + $forms = iterator_to_array($forms); + + if (isset($data['pulled_target'] )) { + foreach ($data['pulled_target'] as $key => $config) { + $data['pulled_target'][$key]['target_name'] = $key; + } + + $forms['pulled_target']->setData(array_values($data['pulled_target'])); + } + + if (isset($data['push_verify_ssl'])) { + $forms['push_verify_ssl']->setData($data['push_verify_ssl']); + } + + if (isset($data['pullInterval'])) { + $forms['pullInterval']->setData($data['pullInterval']); + } + } + + /** + * Data structure like this + * + * uploader-service: + * push_verify_ssl: true + * pullInterval: 60 + * pulled_target: + * target_name1: + * pullmodeUri: "pull mode url" + * client_secret: secret + * client_id: id + * verify_ssl: true + * + * @inheritDoc + */ + public function mapFormsToData($forms, &$data) + { + /** @var FormInterface[] $forms */ + $forms = iterator_to_array($forms); + + $data = null; + + $data['push_verify_ssl'] = $forms['push_verify_ssl']->getData(); + $data['pullInterval'] = $forms['pullInterval']->getData(); + $data['act'] = $forms['act']->getData(); + + /** @var FormInterface[] $exposeConfigForms */ + $uploaderConfigForms = iterator_to_array($forms['pulled_target']); + + foreach ($uploaderConfigForms as $uploaderConfigForm) { + $config = $uploaderConfigForm->getData(); + $targetName = $config['target_name']; + unset($config['target_name']); + + $data['pulled_target'][$targetName] = $config; + } + } + + public function getName() + { + return 'ps_uploader_configuration'; + } +} diff --git a/lib/Alchemy/Phrasea/PhraseanetService/Form/PSUploaderPullType.php b/lib/Alchemy/Phrasea/PhraseanetService/Form/PSUploaderPullType.php new file mode 100644 index 0000000000..236513682f --- /dev/null +++ b/lib/Alchemy/Phrasea/PhraseanetService/Form/PSUploaderPullType.php @@ -0,0 +1,56 @@ +add('pullmodeUri', TextType::class, [ + 'label' => 'admin:phrasea-service-setting:tab:uploader:: pull mode uri', + 'attr' => [ + 'class' => 'input-xxlarge', + 'placeholder' => 'https://api-uploader.phrasea.local/commits?target=b6b9ea65-aecb-401b-9bff-1d29ba69a253' + ] + ]) + ->add('clientSecret', TextType::class, [ + 'label' => 'admin:phrasea-service-setting:tab:uploader:: Client secret', + 'attr' => [ + 'class' => 'input-xxlarge', + 'placeholder' => 'secret' + ] + ]) + ->add('clientId', TextType::class, [ + 'label' => 'admin:phrasea-service-setting:tab:uploader:: Client ID', + 'attr' => [ + 'class' => 'input-xxlarge', + 'placeholder' => 'client_id' + ] + ]) + ->add('verify_ssl', CheckboxType::class, [ + 'label' => 'admin:phrasea-service-setting:tab:uploader:: verify ssl', + 'required' => false + ]) + ->add('target_name', TextType::class, [ + 'label' => 'admin:phrasea-service-setting:tab:uploader:: target Name', + 'attr' => [ + 'class' => 'target-name' + ] + ]) + ; + + } + + public function getName() + { + return 'ps_pullAssets'; + } +} diff --git a/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php b/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php index 59666c9527..477b312a53 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php @@ -12,7 +12,6 @@ use Alchemy\Phrasea\WorkerManager\Event\PopulateIndexEvent; use Alchemy\Phrasea\WorkerManager\Event\WorkerEvents; use Alchemy\Phrasea\WorkerManager\Form\WorkerConfigurationType; use Alchemy\Phrasea\WorkerManager\Form\WorkerFtpType; -use Alchemy\Phrasea\WorkerManager\Form\WorkerPullAssetsType; use Alchemy\Phrasea\WorkerManager\Form\WorkerRecordsActionsType; use Alchemy\Phrasea\WorkerManager\Form\WorkerSearchengineType; use Alchemy\Phrasea\WorkerManager\Form\WorkerValidationReminderType; @@ -478,66 +477,6 @@ class AdminConfigurationController extends Controller return $repoWorkerJob->checkPopulateStatusByDataboxIds($databoxIds); } - public function pullAssetsAction(PhraseaApplication $app, Request $request) - { - $config = $this->getConf()->get(['workers', 'pull_assets'], []); - // the "pullInterval" comes from the ttl_retry - $ttl_retry = $this->getConf()->get(['workers','queues', MessagePublisher::PULL_ASSETS_TYPE, 'ttl_retry'], null); - if(!is_null($ttl_retry)) { - $ttl_retry /= 1000; // form is in sec - } - $config['pullInterval'] = $ttl_retry; - - $form = $app->form(new WorkerPullAssetsType(), $config); - - $form->handleRequest($request); - if ($form->isSubmitted() && $form->isValid()) { - - $data = $form->getData(); - switch($data['act']) { - case 'save' : // save the form content (settings) in 2 places - $ttl_retry = $data['pullInterval']; - unset($data['act'], $data['pullInterval'], $config['pullInterval']); - // save most data under workers/pull_assets - $app['conf']->set(['workers', 'pull_assets'], array_merge($config, $data)); - // save ttl in the q settings - if(!is_null($ttl_retry)) { - $this->getConf()->set(['workers','queues', MessagePublisher::PULL_ASSETS_TYPE, 'ttl_retry'], 1000 * (int)$ttl_retry); - } - $this->getAMQPConnection()->reinitializeQueue([MessagePublisher::PULL_ASSETS_TYPE]); - break; - case 'start': - // reinitialize the validation reminder queues - $this->getAMQPConnection()->setQueue(MessagePublisher::PULL_ASSETS_TYPE); - $this->getAMQPConnection()->reinitializeQueue([MessagePublisher::PULL_ASSETS_TYPE]); - $this->getMessagePublisher()->initializeLoopQueue(MessagePublisher::PULL_ASSETS_TYPE); - break; - case 'stop': - $this->getAMQPConnection()->reinitializeQueue([MessagePublisher::PULL_ASSETS_TYPE]); - break; - } - - // too bad : _fragment does not work with our old url generator... it will be passed as plain url parameter - return $app->redirectPath('worker_admin', ['_fragment'=>'worker-pull-assets']); - } - - // guess if the q is "running" = check if there are pending message on Q or loop-Q - $running = false; - $qStatuses = $this->getAMQPConnection()->getQueuesStatus(); - foreach([ - MessagePublisher::PULL_ASSETS_TYPE, - $this->getAMQPConnection()->getLoopQueueName(MessagePublisher::PULL_ASSETS_TYPE) - ] as $qName) { - if(isset($qStatuses[$qName]) && $qStatuses[$qName]['messageCount'] > 0) { - $running = true; - } - } - return $this->render('admin/worker-manager/worker_pull_assets.html.twig', [ - 'form' => $form->createView(), - 'running' => $running - ]); - } - private function getDefaultRecordsActionsSettings() { return <<add('act', HiddenType::class, [ - 'attr' => [ - 'class' => 'act' - ] - ]); - - $builder - ->add('UploaderApiBaseUri', TextType::class, [ - 'label' => 'admin::workermanager:tab:pullassets: Uploader api base uri' - ]) - ->add('clientSecret', TextType::class, [ - 'label' => 'admin::workermanager:tab:pullassets: Client secret' - ]) - ->add('clientId', TextType::class, [ - 'label' => 'admin::workermanager:tab:pullassets: Client ID' - ]) - ->add('pullInterval', TextType::class, [ - 'label' => 'admin::workermanager:tab:pullassets: Fetching interval in second' - ]) - ->add('verify_ssl', CheckboxType::class, [ - 'label' => 'admin::workermanager:tab:pullassets: verify ssl', - 'required' => false - ]) - ; - - $builder - ->add("apply", SubmitType::class, [ - 'label' => "boutton::appliquer", - 'attr' => ['value' => 'save'] - ]); - - } - - public function getName() - { - return 'worker_pullAssets'; - } -} diff --git a/lib/Alchemy/Phrasea/WorkerManager/Provider/ControllerServiceProvider.php b/lib/Alchemy/Phrasea/WorkerManager/Provider/ControllerServiceProvider.php index f023376057..25080a06a6 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Provider/ControllerServiceProvider.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Provider/ControllerServiceProvider.php @@ -94,11 +94,6 @@ class ControllerServiceProvider implements ControllerProviderInterface, ServiceP $controllers->get('/populate-status', 'controller.worker.admin.configuration:populateStatusAction') ->bind('worker_admin_populate_status'); - /** @uses AdminConfigurationController::pullAssetsAction */ - $controllers->match('/pull-assets', 'controller.worker.admin.configuration:pullAssetsAction') - ->method('GET|POST') - ->bind('worker_admin_pullAssets'); - /** @uses AdminConfigurationController::validationReminderAction */ $controllers->match('/validation-reminder', 'controller.worker.admin.configuration:validationReminderAction') ->method('GET|POST') diff --git a/lib/Alchemy/Phrasea/WorkerManager/Worker/AssetsIngestWorker.php b/lib/Alchemy/Phrasea/WorkerManager/Worker/AssetsIngestWorker.php index 82e6102632..8d30b5baff 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Worker/AssetsIngestWorker.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Worker/AssetsIngestWorker.php @@ -38,7 +38,14 @@ class AssetsIngestWorker implements WorkerInterface $this->saveAssetsList($payload['commit_id'], $assets, $payload['published'], $payload['type']); - $verifySsl = isset($payload['verify_ssl']) ? $payload['verify_ssl'] : true ; + if ($payload['type'] === WorkerRunningJob::TYPE_PUSH) { + // get verify_ssl from config + $verifySsl = $this->app['conf']->get(['phraseanet-service', 'uploader-service', 'push_verify_ssl'], true); + } elseif ($payload['type'] === WorkerRunningJob::TYPE_PULL) { + // the verify_ssl in payload when pull is also from the config in a specific target name + // it is injected from the PullAssetsWorker + $verifySsl = isset($payload['verify_ssl']) ? $payload['verify_ssl'] : true ; + } $proxyConfig = new NetworkProxiesConfiguration($this->app['conf']); $clientOptions = [ diff --git a/lib/Alchemy/Phrasea/WorkerManager/Worker/CreateRecordWorker.php b/lib/Alchemy/Phrasea/WorkerManager/Worker/CreateRecordWorker.php index 8bb08ea413..ae2d040fd1 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Worker/CreateRecordWorker.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Worker/CreateRecordWorker.php @@ -60,6 +60,9 @@ class CreateRecordWorker implements WorkerInterface $em = $this->repoWorkerJob->getEntityManager(); $proxyConfig = new NetworkProxiesConfiguration($this->app['conf']); + + // verify_ssl is getted from config , it depend on the target if we are in pull mode + // it is injected from the AssetsIngestWorker $clientOptions = [ 'base_uri' => $payload['base_url'], 'verify' => $payload['verify_ssl'] @@ -152,22 +155,6 @@ class CreateRecordWorker implements WorkerInterface } - $canAck = $this->repoWorkerJob->canAckUploader($payload['commit_id']); - - // if all assets in the commit are downloaded , send ack to the uploader - if ($canAck) { - // post ack to the uploader - $uploaderClient->post('commits/' . $payload['commit_id'] . '/ack', [ - 'headers' => [ - 'Authorization' => 'AssetToken '.$payload['assetToken'] - ], - 'json' => [ - 'acknowledged' => true - ] - ] - ); - } - $lazaretSession = new LazaretSession(); $userRepository = $this->getUserRepository(); @@ -257,6 +244,18 @@ class CreateRecordWorker implements WorkerInterface if (is_int($payload['storyId']) && $elementCreated instanceof \record_adapter) { $this->addRecordInStory($user, $elementCreated, $sbasId, $payload['storyId'], $body['formData']); } + + // ack by asset + // if all assets of a commit is acknowledge, the commit will automatically acknoledge + $uploaderClient->post('assets/' . $payload['asset'] . '/ack', [ + 'headers' => [ + 'Authorization' => 'AssetToken ' . $payload['assetToken'] + ], + 'json' => [ + 'acknowledged' => true + ] + ] + ); } /** diff --git a/lib/Alchemy/Phrasea/WorkerManager/Worker/PullAssetsWorker.php b/lib/Alchemy/Phrasea/WorkerManager/Worker/PullAssetsWorker.php index 9e5899742f..bfb8c5aeee 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Worker/PullAssetsWorker.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Worker/PullAssetsWorker.php @@ -26,75 +26,84 @@ class PullAssetsWorker implements WorkerInterface public function process(array $payload) { - $config = $this->conf->get(['workers']); + $configs = $this->conf->get(['phraseanet-service', 'uploader-service']); - if (isset($config['pull_assets'])) { - $config = $config['pull_assets']; + if (isset($configs['pulled_target'])) { + $configs = $configs['pulled_target']; } else { + $this->messagePublisher->pushLog("No pull target defined in configuration!"); + return; } - $verifySsl = isset($config['verify_ssl']) ? $config['verify_ssl'] : true ; - - $proxyConfig = new NetworkProxiesConfiguration($this->conf); - $clientOptions = [ - 'base_uri' => $config['UploaderApiBaseUri'], - 'http_errors' => false, - 'verify' => $verifySsl - ]; - - // add proxy in each request if defined in configuration - $uploaderClient = $proxyConfig->getClientWithOptions($clientOptions); - - // if a token exist , use it - if (isset($config['assetToken'])) { - $res = $this->getCommits($uploaderClient, $config); - if ($res == null) { - return; + foreach ($configs as $targetName => $config) { + if (empty($config['pullmodeUri'])) { + $this->messagePublisher->pushLog("No pull mode uri given in this target : " . $targetName); + continue; } - // if Unauthorized get a new token first - if ($res->getStatusCode() == 401) { - if (($config = $this->generateToken($uploaderClient, $config)) === null) { + $verifySsl = isset($config['verify_ssl']) ? $config['verify_ssl'] : true ; + + $proxyConfig = new NetworkProxiesConfiguration($this->conf); + $clientOptions = [ + 'http_errors' => false, + 'verify' => $verifySsl + ]; + + // add proxy in each request if defined in configuration + $uploaderClient = $proxyConfig->getClientWithOptions($clientOptions); + + // if a token exist , use it + if (isset($config['assetToken'])) { + $res = $this->getCommits($uploaderClient, $config); + if ($res == null) { + + return; + } + + // if Unauthorized get a new token first + if ($res->getStatusCode() == 401) { + if (($config = $this->generateToken($uploaderClient, $config, $targetName)) === null) { + return; + }; + $res = $this->getCommits($uploaderClient, $config); + } + } else { // if there is not a token , get one from the uploader service + if (($config = $this->generateToken($uploaderClient, $config, $targetName)) === null) { return; }; - $res = $this->getCommits($uploaderClient, $config); + if (($res = $this->getCommits($uploaderClient, $config)) === null) { + return; + } } - } else { // if there is not a token , get one from the uploader service - if (($config = $this->generateToken($uploaderClient, $config)) === null) { - return; - }; - if (($res = $this->getCommits($uploaderClient, $config)) === null) { - return; - } - } - $body = $res->getBody()->getContents(); - $body = json_decode($body,true); - $commits = $body['hydra:member']; + $body = $res->getBody()->getContents(); + $body = json_decode($body,true); + $commits = $body['hydra:member']; - foreach ($commits as $commit) { - // send only payload in ingest-queue if the commit is ack false and it is not being creating - if (!$commit['acknowledged'] && !$this->isCommitToBeCreating($commit['id'])) { - $this->messagePublisher->pushLog("A new commit found in the uploader ! commit_ID : ".$commit['id']); + foreach ($commits as $commit) { + // send only payload in ingest-queue if the commit is ack false and it is not being creating + if (!$commit['acknowledged'] && !$this->isCommitToBeCreating($commit['id'])) { + $this->messagePublisher->pushLog("A new commit found in the uploader ! commit_ID : ".$commit['id']); - // this is an uploader PULL mode - $payload = [ - 'message_type' => MessagePublisher::ASSETS_INGEST_TYPE, - 'payload' => [ - 'assets' => array_map(function($asset) { - return str_replace('/assets/', '', $asset); - }, $commit['assets']), - 'publisher' => $commit['userId'], - 'commit_id' => $commit['id'], - 'token' => $commit['token'], - 'base_url' => $config['UploaderApiBaseUri'], - 'type' => WorkerRunningJob::TYPE_PULL, - 'verify_ssl'=> $verifySsl - ] - ]; + // this is an uploader PULL mode + $payload = [ + 'message_type' => MessagePublisher::ASSETS_INGEST_TYPE, + 'payload' => [ + 'assets' => array_map(function($asset) { + return str_replace('/assets/', '', $asset); + }, $commit['assets']), + 'publisher' => $commit['userId'], + 'commit_id' => $commit['id'], + 'token' => $commit['token'], + 'base_url' => $this->getBaseUriFromPullmodeUri($config['pullmodeUri']), + 'type' => WorkerRunningJob::TYPE_PULL, + 'verify_ssl'=> $verifySsl // to be used for AssetsIngestWorker and the createRecordWorker + ] + ]; - $this->messagePublisher->publishMessage($payload, MessagePublisher::ASSETS_INGEST_TYPE); + $this->messagePublisher->publishMessage($payload, MessagePublisher::ASSETS_INGEST_TYPE); + } } } @@ -109,13 +118,13 @@ class PullAssetsWorker implements WorkerInterface { // get only unacknowledged try { - $res = $uploaderClient->get('/commits?acknowledged=false', [ + $res = $uploaderClient->get($config['pullmodeUri'] . '&acknowledged=false', [ 'headers' => [ - 'Authorization' => 'Bearer '.$config['assetToken'] + 'Authorization' => 'Bearer '. $config['assetToken'] ] ]); } catch(\Exception $e) { - $this->messagePublisher->pushLog("An error occurred when fetching endpointCommit : " . $e->getMessage()); + $this->messagePublisher->pushLog("An error occurred when fetching endpoint pullmode uri : " . $e->getMessage()); return null; } @@ -128,10 +137,12 @@ class PullAssetsWorker implements WorkerInterface * @param array $config * @return array|null */ - private function generateToken(Client $uploaderClient, array $config) + private function generateToken(Client $uploaderClient, array $config, $targetName) { + $baseUri = $this->getBaseUriFromPullmodeUri($config['pullmodeUri']); + try { - $tokenBody = $uploaderClient->post('/oauth/v2/token', [ + $tokenBody = $uploaderClient->post($baseUri. '/oauth/v2/token', [ 'json' => [ 'client_id' => $config['clientId'], 'client_secret' => $config['clientSecret'], @@ -142,14 +153,14 @@ class PullAssetsWorker implements WorkerInterface $tokenBody = json_decode($tokenBody,true); } catch (\Exception $e) { - $this->messagePublisher->pushLog("An error occurred when fetching endpointToken : " . $e->getMessage()); + $this->messagePublisher->pushLog("An error occurred when fetching endpoint Token : " . $e->getMessage()); return null; } - $this->conf->set(['workers', 'pull_assets', 'assetToken'], $tokenBody['access_token']); + $this->conf->set(['phraseanet-service', 'uploader-service', 'pulled_target', $targetName, 'assetToken'], $tokenBody['access_token']); - return $this->conf->get(['workers', 'pull_assets']); + return $this->conf->get(['phraseanet-service', 'uploader-service', 'pulled_target', $targetName]); } /** @@ -162,4 +173,11 @@ class PullAssetsWorker implements WorkerInterface return count($res) != 0; } + + private function getBaseUriFromPullmodeUri($pullmodeUri) + { + $result = parse_url($pullmodeUri); + + return $result['scheme']."://".$result['host']; + } } diff --git a/lib/classes/patch/416RC5.php b/lib/classes/patch/416RC5.php new file mode 100644 index 0000000000..89cec4799c --- /dev/null +++ b/lib/classes/patch/416RC5.php @@ -0,0 +1,97 @@ +release; + } + + /** + * {@inheritdoc} + */ + public function getDoctrineMigrations() + { + return []; + } + + /** + * {@inheritdoc} + */ + public function require_all_upgrades() + { + return false; + } + + /** + * {@inheritdoc} + */ + public function concern() + { + return $this->concern; + } + + /** + * {@inheritdoc} + */ + public function apply(base $base, Application $app) + { + if ($base->get_base_type() === base::DATA_BOX) { + $this->patch_databox($base, $app); + } + elseif ($base->get_base_type() === base::APPLICATION_BOX) { + $this->patch_appbox($base, $app); + } + + return true; + } + + private function patch_databox(databox $databox, Application $app) + { + } + + private function patch_appbox(base $databox, Application $app) + { + + /** @var PropertyAccess $conf */ + $conf = $app['conf']; + + if (!$conf->has(['phraseanet-service', 'uploader-service'])) { + $clientSecret = ''; + $clientId = ''; + if ($conf->has(['workers', 'pull_assets'])) { + $pullAssets = $conf->get(['workers', 'pull_assets']); + $clientSecret = !empty($pullAssets['clientSecret']) ? $pullAssets['clientSecret'] : $clientSecret; + $clientId = !empty($pullAssets['clientId']) ? $pullAssets['clientId'] : $clientId; + } + + $config = [ + 'push_verify_ssl' => true, + 'pulled_target' => [ + 'target 1' => [ + 'pullmodeUri' => '', + 'clientSecret' => $clientSecret, + 'clientId' => $clientId, + 'verify_ssl' => true + ], + ], + ]; + + $conf->set(['phraseanet-service', 'uploader-service'], $config); + } + + $conf->remove(['workers', 'pull_assets']); + } +} diff --git a/lib/conf.d/json_schema/assets_enqueue.json b/lib/conf.d/json_schema/assets_enqueue.json index 1329988d73..416f321fb6 100644 --- a/lib/conf.d/json_schema/assets_enqueue.json +++ b/lib/conf.d/json_schema/assets_enqueue.json @@ -18,10 +18,6 @@ }, "commit_id": { "type": "string" - }, - "verify_ssl": { - "type": "boolean", - "default": true } }, "required": [ diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index 589b1c935f..60b7d242a3 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -436,6 +436,11 @@ 500 Zeichen max. Bridge/Youtube/upload.html.twig + + 60 + 60 + PhraseanetService/Form/PSUploaderConfigurationType.php + A zu @@ -482,11 +487,6 @@ Ein Plichtfeld fehlt oder wurde nicht ausgefüllt Bridge/Api/Youtube.php - - A task has been created, please run it to complete empty collection - Eine Aufgabe wurde erschafft; bitte führen Sie sie aus, um die Kollektion zu leeren - Controller/Admin/DataboxController.php - A third-party application is a product developed apart from Phraseanet and that would access Phraseanet data. Eine Drittanwendung ist ein Produkt, das ausser Phraseanet entwickelt wird und das auf Phraseanet Daten einen Zugriff haben kann. @@ -635,7 +635,7 @@ Activer aktivieren - admin/databox/databox.html.twig + admin/databox/databox.html.twig web/admin/editusers_timelimit_sbas.html.twig web/admin/editusers_timelimit.html.twig @@ -647,7 +647,7 @@ Activer une collection eine Kollektion aktivieren - admin/databox/databox.html.twig + admin/databox/databox.html.twig Activity @@ -962,17 +962,17 @@ Model/Manipulator/LazaretManipulator.php Model/Manipulator/LazaretManipulator.php Controller/Admin/DataboxesController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php @@ -980,8 +980,8 @@ Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Prod/LazaretController.php Controller/Prod/MoveCollectionController.php Controller/Prod/ToolsController.php @@ -1414,7 +1414,7 @@ Bad Request Format, nur JSON wird erlaubt Controller/Admin/RootController.php Controller/Admin/RootController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Root/AccountController.php @@ -1439,11 +1439,6 @@ Datenbank konnte nicht erstellt werden Controller/Admin/DataboxesController.php - - Base empty successful - Datenbank Leerung wurde erfolgreich - Controller/Admin/DataboxController.php - Basket Sammelkorb @@ -1921,7 +1916,7 @@ Confirmez-vous la re-indexation de la base ? Bestätigen Sie die Re- Indizierung der Datenbank? - admin/databox/databox.html.twig + admin/databox/databox.html.twig Connection @@ -2814,10 +2809,10 @@ eine Kollektion leeren TaskManager/Job/EmptyCollectionJob.php - - Empty collection will do by the worker - Empty collection will do by the worker - Controller/Admin/CollectionController.php + + Empty collection will be do by the worker + Empty collection will be do by the worker + Controller/Admin/CollectionController.php Empty if not used @@ -2839,7 +2834,7 @@ Empty the collection before removing Kollektion leeren bevor Entfernung Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php En attente @@ -3789,7 +3784,7 @@ Invalid file type, only (%supported_file_types%) file formats are supported ungültiger Dateityp, nur (%supported_file_types%) Dateitypen werden unterstützt user/import/file.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin/statusbit/edit.html.twig @@ -3800,7 +3795,7 @@ Invalid labels parameter ungültige Labels Parameter - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -3875,19 +3870,19 @@ L'utilisateur approuve ce document Benutzer genehmigt dieses Dokument prod/preview/voting_notice.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig L'utilisateur desapprouve ce document Benutzer lehnt dieses Dokument ab prod/preview/voting_notice.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig L'utilisateur n'a pas encore donne son avis sur ce document Benutzer hat seine Meinung noch nicht gegeben prod/preview/voting_notice.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig La connection vers le serveur distant est OK @@ -4339,13 +4334,13 @@ Missing labels parameter Labels-Parameter fehlt - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Missing name parameter Name-Parameter fehlt - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Missing path parameter @@ -4392,7 +4387,7 @@ Monter la collection %name% Kollektion %name% aufstellen - admin/databox/databox.html.twig + admin/databox/databox.html.twig More @@ -6265,10 +6260,10 @@ Start Start admin/worker-manager/worker_validation_reminder.html.twig - admin/worker-manager/worker_pull_assets.html.twig admin/worker-manager/worker_records_actions.html.twig admin/task-manager/templates.html.twig admin/task-manager/templates.html.twig + admin/phraseanet-service/uploader.html.twig Start Range @@ -6318,10 +6313,10 @@ prod/upload/lazaret.html.twig prod/upload/lazaret.html.twig admin/worker-manager/worker_validation_reminder.html.twig - admin/worker-manager/worker_pull_assets.html.twig admin/worker-manager/worker_records_actions.html.twig admin/task-manager/templates.html.twig admin/task-manager/templates.html.twig + admin/phraseanet-service/uploader.html.twig Stopped @@ -6409,28 +6404,28 @@ Successful removal erfolgreiches Löschen - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Successful update Erfolgreiches Update - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php actions/Tools/videoEditor.html.twig admin/collection/suggested_value.html.twig admin/collection/collection.html.twig @@ -6665,7 +6660,7 @@ The publication has been stopped Veröffentlichung wurde gestoppt - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -6800,7 +6795,7 @@ This user does not participate to the validation but is only viewer. Dieser Benutzer darf nicht teilnehmen, nur ansehen. - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig This user has no rights @@ -7426,7 +7421,7 @@ Vous avez envoye une demande de validation de document sur ce panier Sie haben ein Feedback von Dokumenten angefordert prod/WorkZone/Macros.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig Vous avez recu des documents @@ -8155,18 +8150,13 @@ admin::base: Confirmer la suppression de la base Löschen der Datenbank bestätigen - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: Confirmer la suppression de tous les logs Das Löschen aller Logdateien bestätigen? admin/databox/databox.html.twig - - admin::base: Confirmer le vidage complet de la base - Ganze Leerung der Datenbank bestätigen? - admin/databox/databox.html.twig - admin::base: Confirmer vous l'arret de la publication de la base Ende der Datenbankveröffentlichung bestätigen? @@ -8190,7 +8180,7 @@ admin::base: Warning Worker is in process to indexing the same databox Indexierung ist bereits im Gange für diese Databox - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: arreter la publication de la base @@ -8200,8 +8190,8 @@ admin::base: aucun alias Kein Alias - Controller/Admin/DataboxController.php - admin/databox/databox.html.twig + Controller/Admin/DataboxController.php + admin/databox/databox.html.twig admin::base: creer une base @@ -8216,12 +8206,12 @@ admin::base: envoyer un logo (jpeg 35px de hauteur max) Ein Logo senden (Höhe ist 35 px max., JPEG) - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: logo impression PDF Logo für das PDF-Drucken - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: nombre @@ -8262,18 +8252,13 @@ admin::base: supprimer la base Datenbank löschen - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: supprimer tous les logs Alle Logdateien löschen admin/databox/databox.html.twig - - admin::base: vider la base - Datenbank leeren - admin/databox/databox.html.twig - admin::base: vider la base avant de la supprimer Datenbank leeren bevor sie gelöscht wird @@ -8293,8 +8278,8 @@ admin::base:collection: Monter une collection eine Kollektion erstellen - admin/databox/databox.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base:collection: Nom de la nouvelle collection : @@ -8305,7 +8290,7 @@ admin::base:collection: Vous pouvez choisir une collection de reference pour donenr des acces Benutzer und Rechte von der Kollektion anwenden : admin/collection/create.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base:collection: activer la collection @@ -8319,7 +8304,7 @@ admin/collection/collection.html.twig admin/collection/collection.html.twig admin/collection/collection.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base:collection: descativer la collection @@ -8370,7 +8355,7 @@ admin::base:collection: supprimer le logo Logo löschen - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base:collection: vider la collection @@ -9293,7 +9278,7 @@ admin::workermanager: Rabbit config error Konfigurationsfehler des Nachrichten Managers - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:RecordsActions: period in second @@ -9348,7 +9333,7 @@ admin::workermanager:tab:ftp: title FTP - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:metadata: description @@ -9358,42 +9343,7 @@ admin::workermanager:tab:metadata: title Metadaten - admin/worker-manager/index.html.twig - - - admin::workermanager:tab:pullassets: Client ID - Client ID - WorkerManager/Form/WorkerPullAssetsType.php - - - admin::workermanager:tab:pullassets: Client secret - Client secret - WorkerManager/Form/WorkerPullAssetsType.php - - - admin::workermanager:tab:pullassets: Fetching interval in second - Abrufintervall in Sekunden - WorkerManager/Form/WorkerPullAssetsType.php - - - admin::workermanager:tab:pullassets: Uploader api base uri - Uploader API base URI, zum Beispiel: https://api-uploader.phrasea.io - WorkerManager/Form/WorkerPullAssetsType.php - - - admin::workermanager:tab:pullassets: description - Uploader Einstellungen im "Pull" Modus - admin/worker-manager/worker_pull_assets.html.twig - - - admin::workermanager:tab:pullassets: title - Uploader - admin/worker-manager/index.html.twig - - - admin::workermanager:tab:pullassets: verify ssl - Gültigkeit des SSL-Zertifikats prüfen - WorkerManager/Form/WorkerPullAssetsType.php + admin/worker-manager/index.html.twig admin::workermanager:tab:queueMonitor: Consumer count @@ -9428,7 +9378,7 @@ admin::workermanager:tab:queueMonitor: title Warteschlange - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:recordsActions: description @@ -9438,12 +9388,12 @@ admin::workermanager:tab:recordsActions: title Records actions - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:reminder: title Feedback Erinnerung - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:searchengine: Databox to populate @@ -9493,7 +9443,7 @@ admin::workermanager:tab:subview: title Auflösung - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:workerconfig: title @@ -9665,8 +9615,7 @@ admin:expose Retrieve configuration error Unmöglich, die Expose Einstellungen wiederzuherstellen - admin/phraseanet-service/index.html.twig - admin/phraseanet-service/index.html.twig + admin/phraseanet-service/index.html.twig admin:phrasea-service-setting:tab-title:: Page title @@ -9808,6 +9757,71 @@ Gültigkeit des SSL-Zertifikats prüfen PhraseanetService/Form/PSExposeConnectionType.php + + admin:phrasea-service-setting:tab:uploader:: Client ID + admin:phrasea-service-setting:tab:uploader:: Client ID + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phrasea-service-setting:tab:uploader:: Client secret + admin:phrasea-service-setting:tab:uploader:: Client secret + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phrasea-service-setting:tab:uploader:: Delete + admin:phrasea-service-setting:tab:uploader:: Delete + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: Fetching interval in second + admin:phrasea-service-setting:tab:uploader:: Fetching interval in second + PhraseanetService/Form/PSUploaderConfigurationType.php + + + admin:phrasea-service-setting:tab:uploader:: New target pull name + admin:phrasea-service-setting:tab:uploader:: New target pull name + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: New uploader target + admin:phrasea-service-setting:tab:uploader:: New uploader target + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: Save + admin:phrasea-service-setting:tab:uploader:: Save + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: pull mode uri + admin:phrasea-service-setting:tab:uploader:: pull mode uri + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phrasea-service-setting:tab:uploader:: push verify_ssl + admin:phrasea-service-setting:tab:uploader:: push verify_ssl + PhraseanetService/Form/PSUploaderConfigurationType.php + + + admin:phrasea-service-setting:tab:uploader:: target Name + admin:phrasea-service-setting:tab:uploader:: target Name + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phrasea-service-setting:tab:uploader:: uploader setting + admin:phrasea-service-setting:tab:uploader:: uploader setting + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: verify ssl + admin:phrasea-service-setting:tab:uploader:: verify ssl + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phraseanet-service Retrieve configuration error + admin:phraseanet-service Retrieve configuration error + admin/phraseanet-service/index.html.twig + admin:searchengine:aggregates:New field, please confirm setting. admin:searchengine:aggregates:New field, please confirm setting. @@ -9822,7 +9836,7 @@ admin:worker Retrieve configuration error Worker Abruf Konfigurationsfehler - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig alert @@ -9885,7 +9899,7 @@ base:: re-indexer Jetzt die Datenbank neu indexieren (Dieser Vorgang kann bei vielen Datensätzen / ab 10.000/ Stunden dauern) - admin/databox/databox.html.twig + admin/databox/databox.html.twig basket : quitshare @@ -9993,7 +10007,6 @@ Anwenden WorkerManager/Form/WorkerConfigurationType.php WorkerManager/Form/WorkerValidationReminderType.php - WorkerManager/Form/WorkerPullAssetsType.php WorkerManager/Form/WorkerRecordsActionsType.php web/admin/users.html.twig @@ -10386,7 +10399,7 @@ wählen web/prod/index.html.twig admin/collection/create.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig classe @@ -10399,6 +10412,11 @@ client_credentials PhraseanetService/Form/PSExposeConnectionType.php + + client_id + client_id + PhraseanetService/Form/PSUploaderPullType.php + collection.label.unknown Unbekannte Kollektion @@ -10502,7 +10520,7 @@ delete Löschen - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig descendant @@ -10806,7 +10824,7 @@ expose:: logout Abmeldung - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig expose:: preview @@ -11091,6 +11109,11 @@ Stunde(n) admin/worker-manager/worker_info_change_status.html.twig + + https://api-uploader.phrasea.local/commits?target=b6b9ea65-aecb-401b-9bff-1d29ba69a253 + https://api-uploader.phrasea.local/commits?target=b6b9ea65-aecb-401b-9bff-1d29ba69a253 + PhraseanetService/Form/PSUploaderPullType.php + image Bild @@ -11791,17 +11814,17 @@ panier:: ordre Validation ascendante gut bewertet - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig panier:: ordre Validation descendante weniger gut bewertet - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig panier:: ordre du panier Sammelkorb Reihenfolge - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig panier:: renommer le panier @@ -11827,13 +11850,13 @@ paniers:: panier recu de %pusher% Sammelkorb von %pusher% bekommen prod/WorkZone/Macros.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig paniers:: you shared this basket with %n% Sie teilen einen Sammelkorb mit %n% prod/WorkZone/Macros.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig paniers::Vous etes sur le point de supprimer ce panier. Cette action est irreversible. Souhaitez-vous continuer ? @@ -13387,18 +13410,18 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben prod:expose field mapping Mapping - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig prod:expose:Add publication Eine Veröffentlichung hinzufügen - prod/WorkZone/Macros.html.twig prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig prod:expose:Refresh Aktualisieren - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig prod:expose:connection:Auth connexion @@ -13681,7 +13704,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben prod:expose:select expose Expose auswählen - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig prod:mapbox Change position @@ -14653,6 +14676,11 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben Video Screenshot actions/Tools/videoEditor.html.twig + + secret + secret + PhraseanetService/Form/PSUploaderPullType.php + select at least one user Einen Benutzer auswählen @@ -15934,7 +15962,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben wz:block_title:stories Berichte - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig yes diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 58e46211b5..242b39f2bb 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -436,6 +436,11 @@ 500 characters maximum Bridge/Youtube/upload.html.twig + + 60 + 60 + PhraseanetService/Form/PSUploaderConfigurationType.php + A To @@ -482,11 +487,6 @@ A required field is missing or has an empty value Bridge/Api/Youtube.php - - A task has been created, please run it to complete empty collection - A task has been created, please run it to complete empty collection - Controller/Admin/DataboxController.php - A third-party application is a product developed apart from Phraseanet and that would access Phraseanet data. A third-party application is a product developed apart from Phraseanet who access to Phraseanet data. @@ -635,7 +635,7 @@ Activer Activate - admin/databox/databox.html.twig + admin/databox/databox.html.twig web/admin/editusers_timelimit_sbas.html.twig web/admin/editusers_timelimit.html.twig @@ -647,7 +647,7 @@ Activer une collection Activate a collection - admin/databox/databox.html.twig + admin/databox/databox.html.twig Activity @@ -963,17 +963,17 @@ Model/Manipulator/LazaretManipulator.php Model/Manipulator/LazaretManipulator.php Controller/Admin/DataboxesController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php @@ -981,8 +981,8 @@ Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Prod/LazaretController.php Controller/Prod/MoveCollectionController.php Controller/Prod/ToolsController.php @@ -1415,7 +1415,7 @@ Bad request format. Only JSON is allowed. Controller/Admin/RootController.php Controller/Admin/RootController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Root/AccountController.php @@ -1440,11 +1440,6 @@ Base couldn't be created Controller/Admin/DataboxesController.php - - Base empty successful - Dabase succesfully emptied - Controller/Admin/DataboxController.php - Basket Basket @@ -1923,7 +1918,7 @@ Confirmez-vous la re-indexation de la base ? Confirm Database re-indexation - admin/databox/databox.html.twig + admin/databox/databox.html.twig Connection @@ -2817,10 +2812,10 @@ Empty a collection TaskManager/Job/EmptyCollectionJob.php - - Empty collection will do by the worker - Empty collection will do by the worker - Controller/Admin/CollectionController.php + + Empty collection will be do by the worker + Empty collection will be do by the worker + Controller/Admin/CollectionController.php Empty if not used @@ -2842,7 +2837,7 @@ Empty the collection before removing Empty the collection before deleting. Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php En attente @@ -3792,7 +3787,7 @@ Invalid file type, only (%supported_file_types%) file formats are supported Invalid file type. Only %supported_file_types% file formats are supported. user/import/file.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin/statusbit/edit.html.twig @@ -3803,7 +3798,7 @@ Invalid labels parameter Invalid label parameters - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -3878,19 +3873,19 @@ L'utilisateur approuve ce document User approves this document prod/preview/voting_notice.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig L'utilisateur desapprouve ce document User disapproves this document prod/preview/voting_notice.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig L'utilisateur n'a pas encore donne son avis sur ce document User hasn't decided yet prod/preview/voting_notice.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig La connection vers le serveur distant est OK @@ -4342,13 +4337,13 @@ Missing labels parameter Labels missing parameter - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Missing name parameter Missing name parameter - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Missing path parameter @@ -4395,7 +4390,7 @@ Monter la collection %name% Mount collection %name% - admin/databox/databox.html.twig + admin/databox/databox.html.twig More @@ -6268,10 +6263,10 @@ Start Start admin/worker-manager/worker_validation_reminder.html.twig - admin/worker-manager/worker_pull_assets.html.twig admin/worker-manager/worker_records_actions.html.twig admin/task-manager/templates.html.twig admin/task-manager/templates.html.twig + admin/phraseanet-service/uploader.html.twig Start Range @@ -6321,10 +6316,10 @@ prod/upload/lazaret.html.twig prod/upload/lazaret.html.twig admin/worker-manager/worker_validation_reminder.html.twig - admin/worker-manager/worker_pull_assets.html.twig admin/worker-manager/worker_records_actions.html.twig admin/task-manager/templates.html.twig admin/task-manager/templates.html.twig + admin/phraseanet-service/uploader.html.twig Stopped @@ -6412,28 +6407,28 @@ Successful removal Successful removal. - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Successful update Successful update - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php actions/Tools/videoEditor.html.twig admin/collection/suggested_value.html.twig admin/collection/collection.html.twig @@ -6668,7 +6663,7 @@ The publication has been stopped The publication has been stopped. - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -6803,7 +6798,7 @@ This user does not participate to the validation but is only viewer. This user does not participate to the feedback request but is only viewer. - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig This user has no rights @@ -7429,7 +7424,7 @@ Vous avez envoye une demande de validation de document sur ce panier You have pushed this basket for a feedback request prod/WorkZone/Macros.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig Vous avez recu des documents @@ -8158,18 +8153,13 @@ admin::base: Confirmer la suppression de la base Confirm Database removal - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: Confirmer la suppression de tous les logs Delete complete log of database ? admin/databox/databox.html.twig - - admin::base: Confirmer le vidage complet de la base - Delete full content of database ? - admin/databox/databox.html.twig - admin::base: Confirmer vous l'arret de la publication de la base Stop database publication ? @@ -8193,7 +8183,7 @@ admin::base: Warning Worker is in process to indexing the same databox Indexation already in progress on this databox - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: arreter la publication de la base @@ -8203,8 +8193,8 @@ admin::base: aucun alias No aliases - Controller/Admin/DataboxController.php - admin/databox/databox.html.twig + Controller/Admin/DataboxController.php + admin/databox/databox.html.twig admin::base: creer une base @@ -8219,12 +8209,12 @@ admin::base: envoyer un logo (jpeg 35px de hauteur max) Upload Logo (Height 35px max., jpeg) - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: logo impression PDF Print Logo - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: nombre @@ -8265,18 +8255,13 @@ admin::base: supprimer la base Delete database - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: supprimer tous les logs Delete all logs admin/databox/databox.html.twig - - admin::base: vider la base - Empty database - admin/databox/databox.html.twig - admin::base: vider la base avant de la supprimer Empty database before delete @@ -8296,8 +8281,8 @@ admin::base:collection: Monter une collection Mount a collection - admin/databox/databox.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base:collection: Nom de la nouvelle collection : @@ -8308,7 +8293,7 @@ admin::base:collection: Vous pouvez choisir une collection de reference pour donenr des acces apply users and rights from collection : admin/collection/create.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base:collection: activer la collection @@ -8322,7 +8307,7 @@ admin/collection/collection.html.twig admin/collection/collection.html.twig admin/collection/collection.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base:collection: descativer la collection @@ -8373,7 +8358,7 @@ admin::base:collection: supprimer le logo Delete logo - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base:collection: vider la collection @@ -9296,7 +9281,7 @@ admin::workermanager: Rabbit config error Message Queue configuration error - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:RecordsActions: period in second @@ -9351,7 +9336,7 @@ admin::workermanager:tab:ftp: title FTP - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:metadata: description @@ -9361,42 +9346,7 @@ admin::workermanager:tab:metadata: title Metadata - admin/worker-manager/index.html.twig - - - admin::workermanager:tab:pullassets: Client ID - Client ID - WorkerManager/Form/WorkerPullAssetsType.php - - - admin::workermanager:tab:pullassets: Client secret - Client secret - WorkerManager/Form/WorkerPullAssetsType.php - - - admin::workermanager:tab:pullassets: Fetching interval in second - Fetching interval in second - WorkerManager/Form/WorkerPullAssetsType.php - - - admin::workermanager:tab:pullassets: Uploader api base uri - Uploader API base URI, example : https://api-uploader.phrasea.io - WorkerManager/Form/WorkerPullAssetsType.php - - - admin::workermanager:tab:pullassets: description - Uploader "Pull mode" settings - admin/worker-manager/worker_pull_assets.html.twig - - - admin::workermanager:tab:pullassets: title - Uploader - admin/worker-manager/index.html.twig - - - admin::workermanager:tab:pullassets: verify ssl - Check SSL certificate validity - WorkerManager/Form/WorkerPullAssetsType.php + admin/worker-manager/index.html.twig admin::workermanager:tab:queueMonitor: Consumer count @@ -9431,7 +9381,7 @@ admin::workermanager:tab:queueMonitor: title Queues - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:recordsActions: description @@ -9441,12 +9391,12 @@ admin::workermanager:tab:recordsActions: title Records actions - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:reminder: title Feedback Reminder - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:searchengine: Databox to populate @@ -9496,7 +9446,7 @@ admin::workermanager:tab:subview: title Sub definition - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:workerconfig: title @@ -9668,8 +9618,7 @@ admin:expose Retrieve configuration error Expose Retrieval configuration error - admin/phraseanet-service/index.html.twig - admin/phraseanet-service/index.html.twig + admin/phraseanet-service/index.html.twig admin:phrasea-service-setting:tab-title:: Page title @@ -9811,6 +9760,71 @@ Check SSL certificate validity PhraseanetService/Form/PSExposeConnectionType.php + + admin:phrasea-service-setting:tab:uploader:: Client ID + admin:phrasea-service-setting:tab:uploader:: Client ID + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phrasea-service-setting:tab:uploader:: Client secret + admin:phrasea-service-setting:tab:uploader:: Client secret + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phrasea-service-setting:tab:uploader:: Delete + admin:phrasea-service-setting:tab:uploader:: Delete + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: Fetching interval in second + admin:phrasea-service-setting:tab:uploader:: Fetching interval in second + PhraseanetService/Form/PSUploaderConfigurationType.php + + + admin:phrasea-service-setting:tab:uploader:: New target pull name + admin:phrasea-service-setting:tab:uploader:: New target pull name + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: New uploader target + admin:phrasea-service-setting:tab:uploader:: New uploader target + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: Save + admin:phrasea-service-setting:tab:uploader:: Save + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: pull mode uri + admin:phrasea-service-setting:tab:uploader:: pull mode uri + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phrasea-service-setting:tab:uploader:: push verify_ssl + admin:phrasea-service-setting:tab:uploader:: push verify_ssl + PhraseanetService/Form/PSUploaderConfigurationType.php + + + admin:phrasea-service-setting:tab:uploader:: target Name + admin:phrasea-service-setting:tab:uploader:: target Name + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phrasea-service-setting:tab:uploader:: uploader setting + admin:phrasea-service-setting:tab:uploader:: uploader setting + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: verify ssl + admin:phrasea-service-setting:tab:uploader:: verify ssl + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phraseanet-service Retrieve configuration error + admin:phraseanet-service Retrieve configuration error + admin/phraseanet-service/index.html.twig + admin:searchengine:aggregates:New field, please confirm setting. admin:searchengine:aggregates:New field, please confirm setting. @@ -9825,7 +9839,7 @@ admin:worker Retrieve configuration error Worker Retrieve configuration error - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig alert @@ -9888,7 +9902,7 @@ base:: re-indexer Re-index database now (regarding quantity of documents, this operation can last several hours) - admin/databox/databox.html.twig + admin/databox/databox.html.twig basket : quitshare @@ -9996,7 +10010,6 @@ Apply WorkerManager/Form/WorkerConfigurationType.php WorkerManager/Form/WorkerValidationReminderType.php - WorkerManager/Form/WorkerPullAssetsType.php WorkerManager/Form/WorkerRecordsActionsType.php web/admin/users.html.twig @@ -10389,7 +10402,7 @@ Select web/prod/index.html.twig admin/collection/create.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig classe @@ -10402,6 +10415,11 @@ client_credentials PhraseanetService/Form/PSExposeConnectionType.php + + client_id + client_id + PhraseanetService/Form/PSUploaderPullType.php + collection.label.unknown Unknown collection @@ -10505,7 +10523,7 @@ delete Delete - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig descendant @@ -10809,7 +10827,7 @@ expose:: logout Logout - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig expose:: preview @@ -11094,6 +11112,11 @@ Hour(s) admin/worker-manager/worker_info_change_status.html.twig + + https://api-uploader.phrasea.local/commits?target=b6b9ea65-aecb-401b-9bff-1d29ba69a253 + https://api-uploader.phrasea.local/commits?target=b6b9ea65-aecb-401b-9bff-1d29ba69a253 + PhraseanetService/Form/PSUploaderPullType.php + image Image @@ -11794,17 +11817,17 @@ panier:: ordre Validation ascendante Most approved - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig panier:: ordre Validation descendante Less approved - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig panier:: ordre du panier Basket order - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig panier:: renommer le panier @@ -11830,13 +11853,13 @@ paniers:: panier recu de %pusher% Basket received from %pusher% prod/WorkZone/Macros.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig paniers:: you shared this basket with %n% You shared this basket with %n% prod/WorkZone/Macros.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig paniers::Vous etes sur le point de supprimer ce panier. Cette action est irreversible. Souhaitez-vous continuer ? @@ -13394,18 +13417,18 @@ A ” Push” will never expire. prod:expose field mapping Mapping - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig prod:expose:Add publication Add publication - prod/WorkZone/Macros.html.twig prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig prod:expose:Refresh Refresh - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig prod:expose:connection:Auth connexion @@ -13688,7 +13711,7 @@ A ” Push” will never expire. prod:expose:select expose Choose Expose - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig prod:mapbox Change position @@ -14663,6 +14686,11 @@ It is possible to place several search areas Video screenshot actions/Tools/videoEditor.html.twig + + secret + secret + PhraseanetService/Form/PSUploaderPullType.php + select at least one user One user at least must be selected @@ -15944,7 +15972,7 @@ It is possible to place several search areas wz:block_title:stories Stories - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig yes diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 299d55ee6b..29d4a6bc60 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -436,6 +436,11 @@ 500 caractères maximum Bridge/Youtube/upload.html.twig + + 60 + 60 + PhraseanetService/Form/PSUploaderConfigurationType.php + A A @@ -482,11 +487,6 @@ Un champ obligatoire n'est pas rempli Bridge/Api/Youtube.php - - A task has been created, please run it to complete empty collection - Une tâche vient d'être créée. Veuillez la lancer pour vider la collection. - Controller/Admin/DataboxController.php - A third-party application is a product developed apart from Phraseanet and that would access Phraseanet data. Une application tierce est un produit développé en dehors de Phraseanet et qui accède à des données Phraseanet. @@ -635,7 +635,7 @@ Activer Activer - admin/databox/databox.html.twig + admin/databox/databox.html.twig web/admin/editusers_timelimit_sbas.html.twig web/admin/editusers_timelimit.html.twig @@ -647,7 +647,7 @@ Activer une collection Activer la collection - admin/databox/databox.html.twig + admin/databox/databox.html.twig Activity @@ -962,17 +962,17 @@ Model/Manipulator/LazaretManipulator.php Model/Manipulator/LazaretManipulator.php Controller/Admin/DataboxesController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php @@ -980,8 +980,8 @@ Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Prod/LazaretController.php Controller/Prod/MoveCollectionController.php Controller/Prod/ToolsController.php @@ -1414,7 +1414,7 @@ Mauvais format de requête. Seul JSON est autorisé. Controller/Admin/RootController.php Controller/Admin/RootController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Root/AccountController.php @@ -1439,11 +1439,6 @@ La base ne peut pas être créée Controller/Admin/DataboxesController.php - - Base empty successful - Base vidée avec succès - Controller/Admin/DataboxController.php - Basket Panier @@ -1921,7 +1916,7 @@ Confirmez-vous la re-indexation de la base ? Confirmez-vous la ré-indexation de la base ? - admin/databox/databox.html.twig + admin/databox/databox.html.twig Connection @@ -2814,10 +2809,10 @@ Vider une collection TaskManager/Job/EmptyCollectionJob.php - - Empty collection will do by the worker - Empty collection will do by the worker - Controller/Admin/CollectionController.php + + Empty collection will be do by the worker + Empty collection will be do by the worker + Controller/Admin/CollectionController.php Empty if not used @@ -2839,7 +2834,7 @@ Empty the collection before removing Videz la collection avant de la supprimer Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php En attente @@ -3789,7 +3784,7 @@ Invalid file type, only (%supported_file_types%) file formats are supported Type de fichier non supportés. Seuls les types de fichiers %supported_file_types% sont supportés. user/import/file.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin/statusbit/edit.html.twig @@ -3800,7 +3795,7 @@ Invalid labels parameter Paramètre de label incorrect - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -3875,19 +3870,19 @@ L'utilisateur approuve ce document L'utilisateur approuve ce document prod/preview/voting_notice.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig L'utilisateur desapprouve ce document L'utilisateur désapprouve ce document prod/preview/voting_notice.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig L'utilisateur n'a pas encore donne son avis sur ce document L'utilisateur n'a pas encore donné son avis sur ce document prod/preview/voting_notice.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig La connection vers le serveur distant est OK @@ -4339,13 +4334,13 @@ Missing labels parameter Paramètre de label manquant - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Missing name parameter Paramètre de nom manquant - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Missing path parameter @@ -4392,7 +4387,7 @@ Monter la collection %name% Monter la collection %name% - admin/databox/databox.html.twig + admin/databox/databox.html.twig More @@ -6265,10 +6260,10 @@ Start Démarrer admin/worker-manager/worker_validation_reminder.html.twig - admin/worker-manager/worker_pull_assets.html.twig admin/worker-manager/worker_records_actions.html.twig admin/task-manager/templates.html.twig admin/task-manager/templates.html.twig + admin/phraseanet-service/uploader.html.twig Start Range @@ -6318,10 +6313,10 @@ prod/upload/lazaret.html.twig prod/upload/lazaret.html.twig admin/worker-manager/worker_validation_reminder.html.twig - admin/worker-manager/worker_pull_assets.html.twig admin/worker-manager/worker_records_actions.html.twig admin/task-manager/templates.html.twig admin/task-manager/templates.html.twig + admin/phraseanet-service/uploader.html.twig Stopped @@ -6409,28 +6404,28 @@ Successful removal Suppression effectuée - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Successful update Mise à jour réussie - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php actions/Tools/videoEditor.html.twig admin/collection/suggested_value.html.twig admin/collection/collection.html.twig @@ -6665,7 +6660,7 @@ The publication has been stopped La publication a été suspendue - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -6800,7 +6795,7 @@ This user does not participate to the validation but is only viewer. Cet utilisateur ne participe pas à la demande de validation - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig This user has no rights @@ -7426,7 +7421,7 @@ Vous avez envoye une demande de validation de document sur ce panier Vous avez envoyé ce panier pour validation prod/WorkZone/Macros.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig Vous avez recu des documents @@ -8155,18 +8150,13 @@ admin::base: Confirmer la suppression de la base Confirmer la suppression de la base - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: Confirmer la suppression de tous les logs Supprimer l'intégralité des logs de la base ? admin/databox/databox.html.twig - - admin::base: Confirmer le vidage complet de la base - Supprimer l'intégralité du contenu de la base ? - admin/databox/databox.html.twig - admin::base: Confirmer vous l'arret de la publication de la base Stopper la publication de la base ? @@ -8190,7 +8180,7 @@ admin::base: Warning Worker is in process to indexing the same databox Une indexation est déjà en cours sur cette Databox - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: arreter la publication de la base @@ -8200,8 +8190,8 @@ admin::base: aucun alias Aucun Alias - Controller/Admin/DataboxController.php - admin/databox/databox.html.twig + Controller/Admin/DataboxController.php + admin/databox/databox.html.twig admin::base: creer une base @@ -8216,12 +8206,12 @@ admin::base: envoyer un logo (jpeg 35px de hauteur max) Envoyer un logo (jpeg 35px max en hauteur) - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: logo impression PDF Logo pour impression - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: nombre @@ -8262,18 +8252,13 @@ admin::base: supprimer la base Supprimer la base - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: supprimer tous les logs Supprimer tous les logs admin/databox/databox.html.twig - - admin::base: vider la base - Vider la base - admin/databox/databox.html.twig - admin::base: vider la base avant de la supprimer Vider la base avant de la supprimer @@ -8293,8 +8278,8 @@ admin::base:collection: Monter une collection Monter une collection - admin/databox/databox.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base:collection: Nom de la nouvelle collection : @@ -8305,7 +8290,7 @@ admin::base:collection: Vous pouvez choisir une collection de reference pour donenr des acces Copier les droits utilisateur de la collection : admin/collection/create.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base:collection: activer la collection @@ -8319,7 +8304,7 @@ admin/collection/collection.html.twig admin/collection/collection.html.twig admin/collection/collection.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base:collection: descativer la collection @@ -8370,7 +8355,7 @@ admin::base:collection: supprimer le logo Supprimer le logo - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base:collection: vider la collection @@ -9294,7 +9279,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager: Rabbit config error Erreur dans la configuration du gestionnaire de messages - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:RecordsActions: period in second @@ -9349,7 +9334,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:ftp: title FTP - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:metadata: description @@ -9359,42 +9344,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:metadata: title Métadonnées - admin/worker-manager/index.html.twig - - - admin::workermanager:tab:pullassets: Client ID - Client ID - WorkerManager/Form/WorkerPullAssetsType.php - - - admin::workermanager:tab:pullassets: Client secret - Client secret - WorkerManager/Form/WorkerPullAssetsType.php - - - admin::workermanager:tab:pullassets: Fetching interval in second - Intervalle de récupération, en secondes - WorkerManager/Form/WorkerPullAssetsType.php - - - admin::workermanager:tab:pullassets: Uploader api base uri - Uploader API base URI, URI de base de l'api uploader, exemple http://api-uploader.phrasea.io - WorkerManager/Form/WorkerPullAssetsType.php - - - admin::workermanager:tab:pullassets: description - Réglage de l'Uploader en Mode "Pull" - admin/worker-manager/worker_pull_assets.html.twig - - - admin::workermanager:tab:pullassets: title - Uploader - admin/worker-manager/index.html.twig - - - admin::workermanager:tab:pullassets: verify ssl - Vérifier la validité du certificat SSL - WorkerManager/Form/WorkerPullAssetsType.php + admin/worker-manager/index.html.twig admin::workermanager:tab:queueMonitor: Consumer count @@ -9429,7 +9379,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:queueMonitor: title Files de message - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:recordsActions: description @@ -9439,12 +9389,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:recordsActions: title Records Actions - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:reminder: title Rappel de la validation - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:searchengine: Databox to populate @@ -9494,7 +9444,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:subview: title Sous-définition - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:workerconfig: title @@ -9666,8 +9616,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin:expose Retrieve configuration error Impossible de récupérer les réglages de Expose - admin/phraseanet-service/index.html.twig - admin/phraseanet-service/index.html.twig + admin/phraseanet-service/index.html.twig admin:phrasea-service-setting:tab-title:: Page title @@ -9809,6 +9758,71 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Vérifier la validité du certificat SSL PhraseanetService/Form/PSExposeConnectionType.php + + admin:phrasea-service-setting:tab:uploader:: Client ID + admin:phrasea-service-setting:tab:uploader:: Client ID + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phrasea-service-setting:tab:uploader:: Client secret + admin:phrasea-service-setting:tab:uploader:: Client secret + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phrasea-service-setting:tab:uploader:: Delete + admin:phrasea-service-setting:tab:uploader:: Delete + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: Fetching interval in second + admin:phrasea-service-setting:tab:uploader:: Fetching interval in second + PhraseanetService/Form/PSUploaderConfigurationType.php + + + admin:phrasea-service-setting:tab:uploader:: New target pull name + admin:phrasea-service-setting:tab:uploader:: New target pull name + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: New uploader target + admin:phrasea-service-setting:tab:uploader:: New uploader target + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: Save + admin:phrasea-service-setting:tab:uploader:: Save + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: pull mode uri + admin:phrasea-service-setting:tab:uploader:: pull mode uri + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phrasea-service-setting:tab:uploader:: push verify_ssl + admin:phrasea-service-setting:tab:uploader:: push verify_ssl + PhraseanetService/Form/PSUploaderConfigurationType.php + + + admin:phrasea-service-setting:tab:uploader:: target Name + admin:phrasea-service-setting:tab:uploader:: target Name + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phrasea-service-setting:tab:uploader:: uploader setting + admin:phrasea-service-setting:tab:uploader:: uploader setting + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: verify ssl + admin:phrasea-service-setting:tab:uploader:: verify ssl + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phraseanet-service Retrieve configuration error + admin:phraseanet-service Retrieve configuration error + admin/phraseanet-service/index.html.twig + admin:searchengine:aggregates:New field, please confirm setting. admin:searchengine:aggregates:New field, please confirm setting. @@ -9823,7 +9837,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin:worker Retrieve configuration error Erreur lors de la récupération de la configuration des workers - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig alert @@ -9886,7 +9900,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le base:: re-indexer Ré-indexer la base maintenant (selon le nombre de documents, cette opération peut durer plusieurs heures) - admin/databox/databox.html.twig + admin/databox/databox.html.twig basket : quitshare @@ -9994,7 +10008,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Appliquer WorkerManager/Form/WorkerConfigurationType.php WorkerManager/Form/WorkerValidationReminderType.php - WorkerManager/Form/WorkerPullAssetsType.php WorkerManager/Form/WorkerRecordsActionsType.php web/admin/users.html.twig @@ -10387,7 +10400,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Choisir web/prod/index.html.twig admin/collection/create.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig classe @@ -10400,6 +10413,11 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le client_credentials PhraseanetService/Form/PSExposeConnectionType.php + + client_id + client_id + PhraseanetService/Form/PSUploaderPullType.php + collection.label.unknown Collection inconnue @@ -10503,7 +10521,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le delete Supprimer - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig descendant @@ -10807,7 +10825,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le expose:: logout Déconnexion - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig expose:: preview @@ -11092,6 +11110,11 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Heure(s) admin/worker-manager/worker_info_change_status.html.twig + + https://api-uploader.phrasea.local/commits?target=b6b9ea65-aecb-401b-9bff-1d29ba69a253 + https://api-uploader.phrasea.local/commits?target=b6b9ea65-aecb-401b-9bff-1d29ba69a253 + PhraseanetService/Form/PSUploaderPullType.php + image images @@ -11792,17 +11815,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le panier:: ordre Validation ascendante Mieux noté - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig panier:: ordre Validation descendante Moins noté - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig panier:: ordre du panier Ordre du panier - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig panier:: renommer le panier @@ -11828,13 +11851,13 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le paniers:: panier recu de %pusher% Panier reçu de %pusher% prod/WorkZone/Macros.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig paniers:: you shared this basket with %n% Vous partagez un panier avec %n% prod/WorkZone/Macros.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig paniers::Vous etes sur le point de supprimer ce panier. Cette action est irreversible. Souhaitez-vous continuer ? @@ -13390,18 +13413,18 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles prod:expose field mapping Mapping - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig prod:expose:Add publication Ajouter une publication - prod/WorkZone/Macros.html.twig prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig prod:expose:Refresh Actualiser - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig prod:expose:connection:Auth connexion @@ -13684,7 +13707,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles prod:expose:select expose Choisir l'Expose - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig prod:mapbox Change position @@ -14662,6 +14685,11 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles Capture d'écran vidéo actions/Tools/videoEditor.html.twig + + secret + secret + PhraseanetService/Form/PSUploaderPullType.php + select at least one user Sélectionner au moins un utilisateur @@ -15943,7 +15971,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles wz:block_title:stories Reportages - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig yes diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 5763c40a74..0eedfee6bb 100644 --- a/resources/locales/messages.nl.xlf +++ b/resources/locales/messages.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -436,6 +436,11 @@ Maximum 500 tekens Bridge/Youtube/upload.html.twig + + 60 + 60 + PhraseanetService/Form/PSUploaderConfigurationType.php + A A @@ -482,11 +487,6 @@ Een verplicht veld ontbreekt of heeft geen waarde Bridge/Api/Youtube.php - - A task has been created, please run it to complete empty collection - Een taak werd aangemaakt, gelieve deze uit te voeren om de lege collectie te vervolledigen. - Controller/Admin/DataboxController.php - A third-party application is a product developed apart from Phraseanet and that would access Phraseanet data. Een extern programma is een is een product die niet door Phraseanet is ontwikkeld en dat toegang kan krijgen tot de data van Phraseanet @@ -635,7 +635,7 @@ Activer Activeren - admin/databox/databox.html.twig + admin/databox/databox.html.twig web/admin/editusers_timelimit_sbas.html.twig web/admin/editusers_timelimit.html.twig @@ -647,7 +647,7 @@ Activer une collection Activeer een collectie - admin/databox/databox.html.twig + admin/databox/databox.html.twig Activity @@ -963,17 +963,17 @@ Model/Manipulator/LazaretManipulator.php Model/Manipulator/LazaretManipulator.php Controller/Admin/DataboxesController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php @@ -981,8 +981,8 @@ Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Prod/LazaretController.php Controller/Prod/MoveCollectionController.php Controller/Prod/ToolsController.php @@ -1415,7 +1415,7 @@ Slecht verzoek formaat, enkel JSON is toegestaan Controller/Admin/RootController.php Controller/Admin/RootController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Root/AccountController.php @@ -1440,11 +1440,6 @@ Database kon niet worden aangemaakt Controller/Admin/DataboxesController.php - - Base empty successful - Database met succes geledigd - Controller/Admin/DataboxController.php - Basket Basket @@ -1923,7 +1918,7 @@ Confirmez-vous la re-indexation de la base ? Bevestigt u de herindexering van de database ? - admin/databox/databox.html.twig + admin/databox/databox.html.twig Connection @@ -2823,7 +2818,7 @@ Empty collection will be do by the worker Empty collection will be do by the worker - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Empty if not used @@ -2845,7 +2840,7 @@ Empty the collection before removing Maak eerst de collectie leeg alvorens te verwijderen Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php En attente @@ -3795,7 +3790,7 @@ Invalid file type, only (%supported_file_types%) file formats are supported Ongeldig bestandsformaat, enkel (%supported_file_types%) bestandsformaten worden ondersteund user/import/file.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin/statusbit/edit.html.twig @@ -3806,7 +3801,7 @@ Invalid labels parameter Ongeldige parameter voor labels - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -3881,19 +3876,19 @@ L'utilisateur approuve ce document De gebruiker keurt dit document goed prod/preview/voting_notice.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig L'utilisateur desapprouve ce document De gebruiker keurt dit document af prod/preview/voting_notice.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig L'utilisateur n'a pas encore donne son avis sur ce document De gebruiker heeft nog zijn mening niet gegeven over dit document prod/preview/voting_notice.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig La connection vers le serveur distant est OK @@ -4345,13 +4340,13 @@ Missing labels parameter Ontbrekende parameter voor labels - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Missing name parameter Ontbrekende parameter voor naam - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Missing path parameter @@ -4398,7 +4393,7 @@ Monter la collection %name% Monter la collection %name% - admin/databox/databox.html.twig + admin/databox/databox.html.twig More @@ -6271,10 +6266,10 @@ Start Start admin/worker-manager/worker_validation_reminder.html.twig - admin/worker-manager/worker_pull_assets.html.twig admin/worker-manager/worker_records_actions.html.twig admin/task-manager/templates.html.twig admin/task-manager/templates.html.twig + admin/phraseanet-service/uploader.html.twig Start Range @@ -6324,10 +6319,10 @@ prod/upload/lazaret.html.twig prod/upload/lazaret.html.twig admin/worker-manager/worker_validation_reminder.html.twig - admin/worker-manager/worker_pull_assets.html.twig admin/worker-manager/worker_records_actions.html.twig admin/task-manager/templates.html.twig admin/task-manager/templates.html.twig + admin/phraseanet-service/uploader.html.twig Stopped @@ -6415,28 +6410,28 @@ Successful removal Met succes verwijderd - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Successful update Geslaagde update - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php actions/Tools/videoEditor.html.twig admin/collection/suggested_value.html.twig admin/collection/collection.html.twig @@ -6671,7 +6666,7 @@ The publication has been stopped Het programma is gestopt - Controller/Admin/CollectionController.php + Controller/Admin/CollectionController.php Controller/Admin/DataboxController.php @@ -6806,7 +6801,7 @@ This user does not participate to the validation but is only viewer. Deze gebruiker maakt geen deel uit van de goedkeuring maar is enkel een bezoeker. - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig This user has no rights @@ -7432,7 +7427,7 @@ Vous avez envoye une demande de validation de document sur ce panier U hebt een aanvraag tot goedkeuring van documenten in dit mandje verstuurd prod/WorkZone/Macros.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig Vous avez recu des documents @@ -8161,18 +8156,13 @@ admin::base: Confirmer la suppression de la base Bevestig het verwijderen van de database - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: Confirmer la suppression de tous les logs Bevestig het verwijderen van alle log files admin/databox/databox.html.twig - - admin::base: Confirmer le vidage complet de la base - Bevestig het kompleet leegmaken van de database - admin/databox/databox.html.twig - admin::base: Confirmer vous l'arret de la publication de la base Bevestigt u het stoppen van de publicatie van de database @@ -8196,7 +8186,7 @@ admin::base: Warning Worker is in process to indexing the same databox admin::base: Warning Worker is in process to indexing the same databox - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: arreter la publication de la base @@ -8206,8 +8196,8 @@ admin::base: aucun alias Geen enkel snelkoppeling - Controller/Admin/DataboxController.php - admin/databox/databox.html.twig + Controller/Admin/DataboxController.php + admin/databox/databox.html.twig admin::base: creer une base @@ -8222,12 +8212,12 @@ admin::base: envoyer un logo (jpeg 35px de hauteur max) Verstuur een logo (jpeg 35px maximale hoogte) - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: logo impression PDF Logo PDF print - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: nombre @@ -8268,18 +8258,13 @@ admin::base: supprimer la base Verwijder de database - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base: supprimer tous les logs Verwijder alle logbestanden admin/databox/databox.html.twig - - admin::base: vider la base - Leeg de database - admin/databox/databox.html.twig - admin::base: vider la base avant de la supprimer Maak eerst de database leeg alvorens te verwijderen @@ -8299,8 +8284,8 @@ admin::base:collection: Monter une collection Toon een collectie - admin/databox/databox.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base:collection: Nom de la nouvelle collection : @@ -8311,7 +8296,7 @@ admin::base:collection: Vous pouvez choisir une collection de reference pour donenr des acces U kan een standaard collectie kiezen voor toegang te verlenen admin/collection/create.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base:collection: activer la collection @@ -8325,7 +8310,7 @@ admin/collection/collection.html.twig admin/collection/collection.html.twig admin/collection/collection.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base:collection: descativer la collection @@ -8376,7 +8361,7 @@ admin::base:collection: supprimer le logo Verwijder het logo - admin/databox/databox.html.twig + admin/databox/databox.html.twig admin::base:collection: vider la collection @@ -9299,7 +9284,7 @@ admin::workermanager: Rabbit config error admin::workermanager: Rabbit config error - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:RecordsActions: period in second @@ -9354,7 +9339,7 @@ admin::workermanager:tab:ftp: title admin::workermanager:tab:ftp: title - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:metadata: description @@ -9364,42 +9349,7 @@ admin::workermanager:tab:metadata: title admin::workermanager:tab:metadata: title - admin/worker-manager/index.html.twig - - - admin::workermanager:tab:pullassets: Client ID - admin::workermanager:tab:pullassets: Client ID - WorkerManager/Form/WorkerPullAssetsType.php - - - admin::workermanager:tab:pullassets: Client secret - admin::workermanager:tab:pullassets: Client secret - WorkerManager/Form/WorkerPullAssetsType.php - - - admin::workermanager:tab:pullassets: Fetching interval in second - admin::workermanager:tab:pullassets: Fetching interval in second - WorkerManager/Form/WorkerPullAssetsType.php - - - admin::workermanager:tab:pullassets: Uploader api base uri - admin::workermanager:tab:pullassets: Uploader api base uri - WorkerManager/Form/WorkerPullAssetsType.php - - - admin::workermanager:tab:pullassets: description - admin::workermanager:tab:pullassets: description - admin/worker-manager/worker_pull_assets.html.twig - - - admin::workermanager:tab:pullassets: title - admin::workermanager:tab:pullassets: title - admin/worker-manager/index.html.twig - - - admin::workermanager:tab:pullassets: verify ssl - admin::workermanager:tab:pullassets: verify ssl - WorkerManager/Form/WorkerPullAssetsType.php + admin/worker-manager/index.html.twig admin::workermanager:tab:queueMonitor: Consumer count @@ -9434,7 +9384,7 @@ admin::workermanager:tab:queueMonitor: title admin::workermanager:tab:queueMonitor: title - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:recordsActions: description @@ -9444,12 +9394,12 @@ admin::workermanager:tab:recordsActions: title admin::workermanager:tab:recordsActions: title - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:reminder: title admin::workermanager:tab:reminder: title - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:searchengine: Databox to populate @@ -9499,7 +9449,7 @@ admin::workermanager:tab:subview: title admin::workermanager:tab:subview: title - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig admin::workermanager:tab:workerconfig: title @@ -9671,8 +9621,7 @@ admin:expose Retrieve configuration error admin:expose Retrieve configuration error - admin/phraseanet-service/index.html.twig - admin/phraseanet-service/index.html.twig + admin/phraseanet-service/index.html.twig admin:phrasea-service-setting:tab-title:: Page title @@ -9814,6 +9763,71 @@ admin:phrasea-service-setting:tab:expose:: verify ssl PhraseanetService/Form/PSExposeConnectionType.php + + admin:phrasea-service-setting:tab:uploader:: Client ID + admin:phrasea-service-setting:tab:uploader:: Client ID + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phrasea-service-setting:tab:uploader:: Client secret + admin:phrasea-service-setting:tab:uploader:: Client secret + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phrasea-service-setting:tab:uploader:: Delete + admin:phrasea-service-setting:tab:uploader:: Delete + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: Fetching interval in second + admin:phrasea-service-setting:tab:uploader:: Fetching interval in second + PhraseanetService/Form/PSUploaderConfigurationType.php + + + admin:phrasea-service-setting:tab:uploader:: New target pull name + admin:phrasea-service-setting:tab:uploader:: New target pull name + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: New uploader target + admin:phrasea-service-setting:tab:uploader:: New uploader target + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: Save + admin:phrasea-service-setting:tab:uploader:: Save + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: pull mode uri + admin:phrasea-service-setting:tab:uploader:: pull mode uri + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phrasea-service-setting:tab:uploader:: push verify_ssl + admin:phrasea-service-setting:tab:uploader:: push verify_ssl + PhraseanetService/Form/PSUploaderConfigurationType.php + + + admin:phrasea-service-setting:tab:uploader:: target Name + admin:phrasea-service-setting:tab:uploader:: target Name + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phrasea-service-setting:tab:uploader:: uploader setting + admin:phrasea-service-setting:tab:uploader:: uploader setting + admin/phraseanet-service/uploader.html.twig + + + admin:phrasea-service-setting:tab:uploader:: verify ssl + admin:phrasea-service-setting:tab:uploader:: verify ssl + PhraseanetService/Form/PSUploaderPullType.php + + + admin:phraseanet-service Retrieve configuration error + admin:phraseanet-service Retrieve configuration error + admin/phraseanet-service/index.html.twig + admin:searchengine:aggregates:New field, please confirm setting. admin:searchengine:aggregates:New field, please confirm setting. @@ -9828,7 +9842,7 @@ admin:worker Retrieve configuration error admin:worker Retrieve configuration error - admin/worker-manager/index.html.twig + admin/worker-manager/index.html.twig alert @@ -9891,7 +9905,7 @@ base:: re-indexer herindexeren - admin/databox/databox.html.twig + admin/databox/databox.html.twig basket : quitshare @@ -9999,7 +10013,6 @@ Toepassen WorkerManager/Form/WorkerConfigurationType.php WorkerManager/Form/WorkerValidationReminderType.php - WorkerManager/Form/WorkerPullAssetsType.php WorkerManager/Form/WorkerRecordsActionsType.php web/admin/users.html.twig @@ -10392,7 +10405,7 @@ kiezen web/prod/index.html.twig admin/collection/create.html.twig - admin/databox/databox.html.twig + admin/databox/databox.html.twig classe @@ -10405,6 +10418,11 @@ client_credentials PhraseanetService/Form/PSExposeConnectionType.php + + client_id + client_id + PhraseanetService/Form/PSUploaderPullType.php + collection.label.unknown collection.label.unknown @@ -10508,7 +10526,7 @@ delete Verwijderen - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig descendant @@ -10812,7 +10830,7 @@ expose:: logout expose:: logout - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig expose:: preview @@ -11097,6 +11115,11 @@ hour admin/worker-manager/worker_info_change_status.html.twig + + https://api-uploader.phrasea.local/commits?target=b6b9ea65-aecb-401b-9bff-1d29ba69a253 + https://api-uploader.phrasea.local/commits?target=b6b9ea65-aecb-401b-9bff-1d29ba69a253 + PhraseanetService/Form/PSUploaderPullType.php + image Beeld @@ -11797,17 +11820,17 @@ panier:: ordre Validation ascendante Oplopende validatie volgorde - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig panier:: ordre Validation descendante Aflopende validatie volgorde - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig panier:: ordre du panier Volgordre van het mandje - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig panier:: renommer le panier @@ -11833,13 +11856,13 @@ paniers:: panier recu de %pusher% Mandje ontvangen van %pusher% prod/WorkZone/Macros.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig paniers:: you shared this basket with %n% paniers:: you shared this basket with %n% prod/WorkZone/Macros.html.twig - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig paniers::Vous etes sur le point de supprimer ce panier. Cette action est irreversible. Souhaitez-vous continuer ? @@ -13392,18 +13415,18 @@ prod:expose field mapping prod:expose field mapping - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig prod:expose:Add publication prod:expose:Add publication - prod/WorkZone/Macros.html.twig prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig prod:expose:Refresh prod:expose:Refresh - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig prod:expose:connection:Auth connexion @@ -13686,7 +13709,7 @@ prod:expose:select expose prod:expose:select expose - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig prod:mapbox Change position @@ -14658,6 +14681,11 @@ schermafbeelding video actions/Tools/videoEditor.html.twig + + secret + secret + PhraseanetService/Form/PSUploaderPullType.php + select at least one user selecteer ten minste één gebruiker @@ -15939,7 +15967,7 @@ wz:block_title:stories wz:block_title:stories - prod/WorkZone/Macros.html.twig + prod/WorkZone/Macros.html.twig yes diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index f0cb669ee9..0f520c4281 100644 --- a/resources/locales/validators.de.xlf +++ b/resources/locales/validators.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.en.xlf b/resources/locales/validators.en.xlf index 410285b29b..3c40ee94a5 100644 --- a/resources/locales/validators.en.xlf +++ b/resources/locales/validators.en.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.fr.xlf b/resources/locales/validators.fr.xlf index f9514d4acb..a335ef7cb4 100644 --- a/resources/locales/validators.fr.xlf +++ b/resources/locales/validators.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.nl.xlf b/resources/locales/validators.nl.xlf index 808e99c910..dc1e70dc9d 100644 --- a/resources/locales/validators.nl.xlf +++ b/resources/locales/validators.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index 5fa55aa1e7..0510a41ce9 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -1129,10 +1129,40 @@ span.simplecolorpicker.picker { } /***Uploader tab***/ -#worker-pull-assets { - input[type=checkbox] { - float: left; - margin-right: 10px; +#uploader { + max-width: 992px; + .uploader-header { + position: relative; + } + .target-block { + border: 2px solid #ddd; + padding: 15px; + margin-bottom: 10px; + margin-top: 10px; + width: 100%; + display: inline-block; + box-sizing: border-box; + position: relative; + } + button[type=submit] { + &.save-uploader { + position: absolute; + top: 0; + right: 0; + } + } + .upload-delete-btn { + float: right; + display: inline-block; + } + .target-title { + &.ui-accordion-header-active { + background: #3b99fc; + color: #fff; + } + } + #add-new-target { + margin: 20px auto 0; } } diff --git a/templates/web/admin/phraseanet-service/index.html.twig b/templates/web/admin/phraseanet-service/index.html.twig index ae20020e07..4aa829dea3 100644 --- a/templates/web/admin/phraseanet-service/index.html.twig +++ b/templates/web/admin/phraseanet-service/index.html.twig @@ -2,15 +2,15 @@
@@ -18,7 +18,7 @@
-
+
@@ -57,11 +57,14 @@ contentsDownloaded[e.target.hash] = true; }, function(error) { console.log(error); - targetDiv.empty().html('{{ 'admin:expose Retrieve configuration error'|trans }}'); + targetDiv.empty().html('{{ 'admin:phraseanet-service Retrieve configuration error'|trans }}'); }); } }); + var sel = '.phraseanet-service-setting-tabs li.{{ _fragment }} a'; + $(sel).click(); + $(document).ready(function () { remoteContent("/admin/phraseanet-service/expose").then(function(response) { $('#expose').empty().html(response); diff --git a/templates/web/admin/phraseanet-service/uploader.html.twig b/templates/web/admin/phraseanet-service/uploader.html.twig index 2fad31e72e..3af11e9081 100644 --- a/templates/web/admin/phraseanet-service/uploader.html.twig +++ b/templates/web/admin/phraseanet-service/uploader.html.twig @@ -1 +1,129 @@ -

uploader setting

+{% macro widget_prototype(form) %} +

{{ 'admin:phrasea-service-setting:tab:uploader:: New uploader target' | trans }}

+
+
+

+

+
+ +
+ {{ form_row(form.target_name) }} +
+ +
+ {{ form_widget(form.verify_ssl) }} + {{ form_label(form.verify_ssl) }} +
+ +
+ {{ form_row(form.pullmodeUri) }} +
+ +
+ {{ form_row(form.clientSecret) }} +
+ +
+ {{ form_row(form.clientId) }} +
+
+{% endmacro %} + +

{{ 'admin:phrasea-service-setting:tab:uploader:: uploader setting' | trans }}

+ +{{ form_start(form, {'action': path('ps_admin_uploader')}) }} +
+
+ {{ form_widget(form.push_verify_ssl) }} + {{ form_label(form.push_verify_ssl) }} +
+
+ {{ form_label(form.pullInterval) }} + {{ form_widget(form.pullInterval) }} +
+ +
+ {% if(running) %} + + {% else %} + + {% endif %} +
+ +
+
+
+
+ +
+ +
+
+ +
+ {% for uploader_connection in form.pulled_target %} + {{ _self.widget_prototype(uploader_connection) }} + {% endfor %} +
+ +{{ form_end(form) }} + + + diff --git a/templates/web/admin/worker-manager/index.html.twig b/templates/web/admin/worker-manager/index.html.twig index 26226d0995..f2b90c5c87 100644 --- a/templates/web/admin/worker-manager/index.html.twig +++ b/templates/web/admin/worker-manager/index.html.twig @@ -20,11 +20,6 @@ {{ 'admin::workermanager:tab:searchengine: title' |trans }} -