From 94b562b846621eb65edb792bcd96a7cae55f3118 Mon Sep 17 00:00:00 2001 From: aynsix Date: Tue, 23 Feb 2021 17:33:09 +0300 Subject: [PATCH 1/2] PHRAS-3366 database reindex --- .../Controller/Admin/DataboxController.php | 33 +++++++- .../Event/PopulateIndexEvent.php | 5 ++ resources/locales/messages.de.xlf | 81 ++++++++++--------- resources/locales/messages.en.xlf | 81 ++++++++++--------- resources/locales/messages.fr.xlf | 81 ++++++++++--------- resources/locales/messages.nl.xlf | 73 +++++++++-------- resources/locales/validators.de.xlf | 2 +- resources/locales/validators.en.xlf | 2 +- resources/locales/validators.fr.xlf | 2 +- resources/locales/validators.nl.xlf | 2 +- templates/web/admin/databox/databox.html.twig | 29 ++++++- 11 files changed, 230 insertions(+), 161 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/DataboxController.php b/lib/Alchemy/Phrasea/Controller/Admin/DataboxController.php index f1e8e5e6a0..dc93d685f6 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/DataboxController.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/DataboxController.php @@ -15,6 +15,10 @@ use Alchemy\Phrasea\Authentication\ACLProvider; use Alchemy\Phrasea\Authentication\Authenticator; use Alchemy\Phrasea\Controller\Controller; use Alchemy\Phrasea\Model\Manipulator\TaskManipulator; +use Alchemy\Phrasea\SearchEngine\Elastic\ElasticsearchOptions; +use Alchemy\Phrasea\WorkerManager\Event\PopulateIndexEvent; +use Alchemy\Phrasea\WorkerManager\Event\WorkerEvents; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; @@ -173,19 +177,24 @@ class DataboxController extends Controller public function reindex(Request $request, $databox_id) { $success = false; + $options = $this->getElasticsearchOptions(); + + $populateInfo = [ + 'host' => $options->getHost(), + 'port' => $options->getPort(), + 'indexName' => $options->getIndexName(), + 'databoxIds' => [$databox_id] + ]; try { - $this->findDataboxById($databox_id)->reindex(); + $this->getDispatcher()->dispatch(WorkerEvents::POPULATE_INDEX, new PopulateIndexEvent($populateInfo)); $success = true; } catch (\Exception $e) { - } if ('json' === $request->getRequestFormat()) { return $this->app->json([ 'success' => $success, - 'msg' => $success ? $this->app->trans('Successful update') : $this->app->trans('An error occured'), - 'sbas_id' => $databox_id, ]); } @@ -758,4 +767,20 @@ class DataboxController extends Controller 'total' => $total ]); } + + /** + * @return EventDispatcherInterface + */ + private function getDispatcher() + { + return $this->app['dispatcher']; + } + + /** + * @return ElasticsearchOptions + */ + private function getElasticsearchOptions() + { + return $this->app['elasticsearch.options']; + } } diff --git a/lib/Alchemy/Phrasea/WorkerManager/Event/PopulateIndexEvent.php b/lib/Alchemy/Phrasea/WorkerManager/Event/PopulateIndexEvent.php index 2287c9b5c5..4a0eeaeae2 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Event/PopulateIndexEvent.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Event/PopulateIndexEvent.php @@ -9,6 +9,11 @@ class PopulateIndexEvent extends SfEvent /** @var array */ private $data; + /** + * PopulateIndexEvent constructor. + * data an array of host, port, indexName, databoxIds(array) + * @param $data + */ public function __construct($data) { $this->data = $data; diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index be6c04d4bc..a43e2cb63e 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,14 +1,14 @@ - + - +
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.
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -501,7 +501,7 @@ 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 + Controller/Admin/DataboxController.php A task has been creted, please run it to complete empty collection @@ -973,16 +973,15 @@ Controller/Prod/ToolsController.php Controller/Prod/StoryController.php Controller/Admin/DataboxesController.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 - 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 + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -1045,7 +1044,7 @@ Controller/Api/V1Controller.php Controller/Api/V1Controller.php Controller/Admin/SearchEngineController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php web/admin/statusbit.html.twig @@ -1431,7 +1430,7 @@ Controller/Root/AccountController.php Controller/Admin/RootController.php Controller/Admin/RootController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Bad request, please contact an admin @@ -1458,7 +1457,7 @@ Base empty successful Datenbank Leerung wurde erfolgreich - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Basket @@ -1565,7 +1564,7 @@ Nach Feld web/prod/index.html.twig - + CGU::PDF CGU generated on %updated_on% and printed on %printed_on% Nutzungsbedingungen erzeugt %updated_on% und gedruckt %printed_on% Out/Module/PDFCgu.php @@ -3123,7 +3122,7 @@ Error while sending the file Fehler beim Datei Senden - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3812,7 +3811,7 @@ Invalid file format Ungültiges Datei Format - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3825,7 +3824,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 @@ -3836,7 +3835,7 @@ Invalid labels parameter ungültige Labels Parameter - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -4377,7 +4376,7 @@ Missing labels parameter Labels-Parameter fehlt - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -4408,7 +4407,7 @@ Missing view name parameter View Name-Parameter fehlt - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Mode de presentation @@ -6471,8 +6470,8 @@ Successful removal erfolgreiches Löschen - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -6481,13 +6480,12 @@ Successful update Erfolgreiches Update - 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 + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -6717,7 +6715,7 @@ The file is too big Datei ist zu gross - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -6733,7 +6731,7 @@ The publication has been stopped Veröffentlichung wurde gestoppt - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -8278,6 +8276,11 @@ Version web/admin/databases.html.twig + + 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::base: arreter la publication de la base Veröffentlichung stoppen @@ -8286,7 +8289,7 @@ admin::base: aucun alias Kein Alias - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin/databox/databox.html.twig @@ -8297,7 +8300,7 @@ admin::base: databox not found Databox nicht gefunden - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin::base: envoyer un logo (jpeg 35px de hauteur max) @@ -8363,7 +8366,7 @@ admin::base: vider la base avant de la supprimer Datenbank leeren bevor sie gelöscht wird - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin::base: xml invalide, les changements ne seront pas appliques diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 346de4ea15..218da2b277 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,14 +1,14 @@ - + - +
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.
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -501,7 +501,7 @@ 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 + Controller/Admin/DataboxController.php A task has been creted, please run it to complete empty collection @@ -974,16 +974,15 @@ Controller/Prod/ToolsController.php Controller/Prod/StoryController.php Controller/Admin/DataboxesController.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 - 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 + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -1046,7 +1045,7 @@ Controller/Api/V1Controller.php Controller/Api/V1Controller.php Controller/Admin/SearchEngineController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php web/admin/statusbit.html.twig @@ -1432,7 +1431,7 @@ Controller/Root/AccountController.php Controller/Admin/RootController.php Controller/Admin/RootController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php
Bad request, please contact an admin @@ -1459,7 +1458,7 @@ Base empty successful Dabase succesfully emptied - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Basket @@ -1566,7 +1565,7 @@ By field web/prod/index.html.twig - + CGU::PDF CGU generated on %updated_on% and printed on %printed_on% Terms of use generated on %updated_on% and printed on %printed_on% Out/Module/PDFCgu.php @@ -3126,7 +3125,7 @@ Error while sending the file Error while sending the file - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3815,7 +3814,7 @@ Invalid file format Invalid file format - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3828,7 +3827,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 @@ -3839,7 +3838,7 @@ Invalid labels parameter Invalid label parameters - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -4380,7 +4379,7 @@ Missing labels parameter Labels missing parameter - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -4411,7 +4410,7 @@ Missing view name parameter Missing name in view parameter - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Mode de presentation @@ -6474,8 +6473,8 @@ Successful removal Successful removal. - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -6484,13 +6483,12 @@ Successful update Successful update - 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 + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -6720,7 +6718,7 @@ The file is too big The file is too large. - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -6736,7 +6734,7 @@ The publication has been stopped The publication has been stopped. - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -8281,6 +8279,11 @@ Version web/admin/databases.html.twig + + 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::base: arreter la publication de la base Stop database publication @@ -8289,7 +8292,7 @@ admin::base: aucun alias No aliases - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin/databox/databox.html.twig @@ -8300,7 +8303,7 @@ admin::base: databox not found Databox was not found - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin::base: envoyer un logo (jpeg 35px de hauteur max) @@ -8366,7 +8369,7 @@ admin::base: vider la base avant de la supprimer Empty database before delete - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin::base: xml invalide, les changements ne seront pas appliques diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index bda708c837..7184869754 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,14 +1,14 @@ - + - +
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.
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -501,7 +501,7 @@ 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 + Controller/Admin/DataboxController.php A task has been creted, please run it to complete empty collection @@ -973,16 +973,15 @@ Controller/Prod/ToolsController.php Controller/Prod/StoryController.php Controller/Admin/DataboxesController.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 - 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 + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -1045,7 +1044,7 @@ Controller/Api/V1Controller.php Controller/Api/V1Controller.php Controller/Admin/SearchEngineController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php web/admin/statusbit.html.twig @@ -1431,7 +1430,7 @@ Controller/Root/AccountController.php Controller/Admin/RootController.php Controller/Admin/RootController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php
Bad request, please contact an admin @@ -1458,7 +1457,7 @@ Base empty successful Base vidée avec succès - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Basket @@ -1565,7 +1564,7 @@ Par champ web/prod/index.html.twig - + CGU::PDF CGU generated on %updated_on% and printed on %printed_on% CGU générée le %updated_on% et imprimée le %printed_on% Out/Module/PDFCgu.php @@ -3123,7 +3122,7 @@ Error while sending the file Erreur lors de l'envoi du fichier - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3812,7 +3811,7 @@ Invalid file format Format de fichier incorrect - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3825,7 +3824,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 @@ -3836,7 +3835,7 @@ Invalid labels parameter Paramètre de label incorrect - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -4377,7 +4376,7 @@ Missing labels parameter Paramètre de label manquant - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -4408,7 +4407,7 @@ Missing view name parameter Paramètre de nom de vue manquant - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Mode de presentation @@ -6473,8 +6472,8 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Successful removal Suppression effectuée - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -6483,13 +6482,12 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Successful update Mise à jour réussie - 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 + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -6719,7 +6717,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis The file is too big Le fichier est trop gros - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -6735,7 +6733,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis The publication has been stopped La publication a été suspendue - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -8280,6 +8278,11 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Version web/admin/databases.html.twig + + 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::base: arreter la publication de la base Arrêter la publication @@ -8288,7 +8291,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::base: aucun alias Aucun Alias - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin/databox/databox.html.twig @@ -8299,7 +8302,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::base: databox not found Databox non trouvée - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin::base: envoyer un logo (jpeg 35px de hauteur max) @@ -8365,7 +8368,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis admin::base: vider la base avant de la supprimer Vider la base avant de la supprimer - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin::base: xml invalide, les changements ne seront pas appliques diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 5710f33d04..2799c025cd 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. @@ -505,7 +505,7 @@ 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 + Controller/Admin/DataboxController.php A task has been creted, please run it to complete empty collection @@ -978,16 +978,15 @@ Controller/Prod/ToolsController.php Controller/Prod/StoryController.php Controller/Admin/DataboxesController.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 - 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 + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -1050,7 +1049,7 @@ Controller/Api/V1Controller.php Controller/Api/V1Controller.php Controller/Admin/SearchEngineController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php web/admin/statusbit.html.twig @@ -1436,7 +1435,7 @@ Controller/Root/AccountController.php Controller/Admin/RootController.php Controller/Admin/RootController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Bad request, please contact an admin @@ -1463,7 +1462,7 @@ Base empty successful Database met succes geledigd - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Basket @@ -3133,7 +3132,7 @@ Error while sending the file Fout bij het versturen van het bestaan - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3822,7 +3821,7 @@ Invalid file format Ongeldige bestandsindeling - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3835,7 +3834,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 @@ -3846,7 +3845,7 @@ Invalid labels parameter Ongeldige parameter voor labels - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -4387,7 +4386,7 @@ Missing labels parameter Ontbrekende parameter voor labels - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -4418,7 +4417,7 @@ Missing view name parameter Ontbrekende parameter voor weergave - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Mode de presentation @@ -6481,8 +6480,8 @@ Successful removal Met succes verwijderd - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -6491,13 +6490,12 @@ Successful update Geslaagde update - 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 + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -6727,7 +6725,7 @@ The file is too big Het bestand is te groot - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -6743,7 +6741,7 @@ The publication has been stopped Het programma is gestopt - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -8288,6 +8286,11 @@ Versie web/admin/databases.html.twig + + 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::base: arreter la publication de la base Stop de publicatie van de database @@ -8296,7 +8299,7 @@ admin::base: aucun alias Geen enkel snelkoppeling - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin/databox/databox.html.twig @@ -8307,7 +8310,7 @@ admin::base: databox not found admin::base: databox not found - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin::base: envoyer un logo (jpeg 35px de hauteur max) @@ -8373,7 +8376,7 @@ admin::base: vider la base avant de la supprimer Maak eerst de database leeg alvorens te verwijderen - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin::base: xml invalide, les changements ne seront pas appliques diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index 3616b721ef..9f29a96f33 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 50f67e3abb..7711d5e51b 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 6f793bc09b..032442298e 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 d5ba8b9f47..36b9a65bb0 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/templates/web/admin/databox/databox.html.twig b/templates/web/admin/databox/databox.html.twig index 5b023477ab..d5e6a62d25 100644 --- a/templates/web/admin/databox/databox.html.twig +++ b/templates/web/admin/databox/databox.html.twig @@ -138,7 +138,7 @@
-
@@ -354,6 +354,33 @@ } }); + $(".databox-reindex").on("click", function() { + var form = $(this).closest('form'); + if(confirm($(this).data('confirm-msg'))) { + var sbasIds = [$(this).data('databox-id')]; + + $.ajax({ + type: 'GET', + url: '/admin/worker-manager/populate-status', + data: { + sbasIds: sbasIds + }, + success: function (data) { + if (data == 0) { + $.ajax({ + url: form.attr('action'), + type: 'POST', + success: function (data) { + } + }); + } else { + alert('{{ "admin::base: Warning Worker is in process to indexing the same databox" |trans }}'); + } + } + }); + } + }); + function submitForm(submitLink, form) { form.bind('submit', function(){ From da986bb5801e0d49b75815d9e9c6ab6d26a05737 Mon Sep 17 00:00:00 2001 From: aynsix Date: Tue, 23 Feb 2021 17:55:44 +0300 Subject: [PATCH 2/2] fix --- lib/Alchemy/Phrasea/Controller/Admin/DataboxController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/DataboxController.php b/lib/Alchemy/Phrasea/Controller/Admin/DataboxController.php index dc93d685f6..8995834bcd 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/DataboxController.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/DataboxController.php @@ -195,6 +195,7 @@ class DataboxController extends Controller if ('json' === $request->getRequestFormat()) { return $this->app->json([ 'success' => $success, + 'sbas_id' => $databox_id ]); }