From 487d2d467f57f08844c31491eee4a8ad5ed44e2a Mon Sep 17 00:00:00 2001 From: aina esokia Date: Mon, 8 Feb 2021 17:17:50 +0300 Subject: [PATCH 1/5] PHRAS-3358 rename patch 4.1.3 --- .../patch/{413_PHRAS_3282.php => 413.php} | 47 +++++++- lib/classes/patch/413_PHRAS_3278.php | 114 ------------------ 2 files changed, 45 insertions(+), 116 deletions(-) rename lib/classes/patch/{413_PHRAS_3282.php => 413.php} (63%) delete mode 100644 lib/classes/patch/413_PHRAS_3278.php diff --git a/lib/classes/patch/413_PHRAS_3282.php b/lib/classes/patch/413.php similarity index 63% rename from lib/classes/patch/413_PHRAS_3282.php rename to lib/classes/patch/413.php index 6ebfab3780..f8a86afc91 100644 --- a/lib/classes/patch/413_PHRAS_3282.php +++ b/lib/classes/patch/413.php @@ -4,8 +4,7 @@ use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Core\Configuration\PropertyAccess; use Alchemy\Phrasea\WorkerManager\Queue\MessagePublisher; - -class patch_413_PHRAS_3282 implements patchInterface +class patch_413 implements patchInterface { const OLDQ2NEWQ_ttl_retry = [ 'assetsIngest' => MessagePublisher::ASSETS_INGEST_TYPE, @@ -26,6 +25,7 @@ class patch_413_PHRAS_3282 implements patchInterface 'delayedSubdef' => MessagePublisher::SUBDEF_CREATION_TYPE, 'delayedWriteMeta' => MessagePublisher::WRITE_METADATAS_TYPE, ]; + /** @var string */ private $release = '4.1.3'; /** @var array */ @@ -80,6 +80,34 @@ class patch_413_PHRAS_3282 implements patchInterface private function patch_databox(base $databox, Application $app) { + // patch to invert push and validation action in log_docs + + // add a new temp action + $sql = "ALTER TABLE log_docs CHANGE action action ENUM('push','add','validate','edit','collection','status','print','substit','publish','download','mail','ftp','delete','to_do','') CHARACTER SET ascii COLLATE ascii_bin NOT NULL"; + $stmt = $databox->get_connection()->prepare($sql); + $stmt->execute(); + $stmt->closeCursor(); + + $sql = "UPDATE log_docs SET action = 'to_do' where action = 'push'"; + $stmt = $databox->get_connection()->prepare($sql); + $stmt->execute(); + $stmt->closeCursor(); + + $sql = "UPDATE log_docs SET action = 'push' where action = 'validate'"; + $stmt = $databox->get_connection()->prepare($sql); + $stmt->execute(); + $stmt->closeCursor(); + + $sql = "UPDATE log_docs SET action = 'validate' where action = 'to_do'"; + $stmt = $databox->get_connection()->prepare($sql); + $stmt->execute(); + $stmt->closeCursor(); + + // remove temp action + $sql = "ALTER TABLE log_docs CHANGE action action ENUM('push','add','validate','edit','collection','status','print','substit','publish','download','mail','ftp','delete','') CHARACTER SET ascii COLLATE ascii_bin NOT NULL"; + $stmt = $databox->get_connection()->prepare($sql); + $stmt->execute(); + $stmt->closeCursor(); } private function patch_appbox(base $databox, Application $app) @@ -115,5 +143,20 @@ class patch_413_PHRAS_3282 implements patchInterface $conf->remove(['workers', 'retry_queue']); $conf->remove(['workers', 'pull_assets']); $conf->remove(['workers', 'validationReminder']); + + // patch for reminder validation key, default value to 20 + $conf->remove(['registry', 'actions', 'validation-reminder-days']); + $conf->set(['registry', 'actions', 'validation-reminder-time-left-percent'], 20); + + // if not exist add maxResultWindow key + if (!$conf->has(['main', 'search-engine', 'options', 'maxResultWindow'])) { + $conf->set(['main', 'search-engine', 'options', 'maxResultWindow'], 500000); + } + + // if not exist add populate_permalinks key + if (!$conf->has(['main', 'search-engine', 'options', 'populate_permalinks'])) { + $conf->set(['main', 'search-engine', 'options', 'populate_permalinks'], false); + } } + } diff --git a/lib/classes/patch/413_PHRAS_3278.php b/lib/classes/patch/413_PHRAS_3278.php deleted file mode 100644 index a92ccce463..0000000000 --- a/lib/classes/patch/413_PHRAS_3278.php +++ /dev/null @@ -1,114 +0,0 @@ -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_appbox(base $databox, Application $app) - { - /** @var PropertyAccess $conf */ - $conf = $app['conf']; - - // patch for reminder validation key, default value to 20 - $conf->remove(['registry', 'actions', 'validation-reminder-days']); - $conf->set(['registry', 'actions', 'validation-reminder-time-left-percent'], 20); - - // if not exist add maxResultWindow key - if (!$conf->has(['main', 'search-engine', 'options', 'maxResultWindow'])) { - $conf->set(['main', 'search-engine', 'options', 'maxResultWindow'], 500000); - } - - // if not exist add populate_permalinks key - if (!$conf->has(['main', 'search-engine', 'options', 'populate_permalinks'])) { - $conf->set(['main', 'search-engine', 'options', 'populate_permalinks'], false); - } - } - - private function patch_databox(base $databox, Application $app) - { - // patch to invert push and validation action in log_docs - - // add a new temp action - $sql = "ALTER TABLE log_docs CHANGE action action ENUM('push','add','validate','edit','collection','status','print','substit','publish','download','mail','ftp','delete','to_do','') CHARACTER SET ascii COLLATE ascii_bin NOT NULL"; - $stmt = $databox->get_connection()->prepare($sql); - $stmt->execute(); - $stmt->closeCursor(); - - $sql = "UPDATE log_docs SET action = 'to_do' where action = 'push'"; - $stmt = $databox->get_connection()->prepare($sql); - $stmt->execute(); - $stmt->closeCursor(); - - $sql = "UPDATE log_docs SET action = 'push' where action = 'validate'"; - $stmt = $databox->get_connection()->prepare($sql); - $stmt->execute(); - $stmt->closeCursor(); - - $sql = "UPDATE log_docs SET action = 'validate' where action = 'to_do'"; - $stmt = $databox->get_connection()->prepare($sql); - $stmt->execute(); - $stmt->closeCursor(); - - // remove temp action - $sql = "ALTER TABLE log_docs CHANGE action action ENUM('push','add','validate','edit','collection','status','print','substit','publish','download','mail','ftp','delete','') CHARACTER SET ascii COLLATE ascii_bin NOT NULL"; - $stmt = $databox->get_connection()->prepare($sql); - $stmt->execute(); - $stmt->closeCursor(); - } -} From a184d965776d280c3d5a0a26cee56c645995ff8b Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Mon, 22 Feb 2021 22:15:24 +0000 Subject: [PATCH 2/5] Translated using Weblate (English) Currently translated at 99.6% (2696 of 2706 strings) --- resources/locales/messages.en.xlf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index cd4caf150d..346de4ea15 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,4 +1,4 @@ - +
@@ -7,8 +7,8 @@
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -1566,9 +1566,9 @@ By field web/prod/index.html.twig - + CGU::PDF CGU generated on %updated_on% and printed on %printed_on% - 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 From 9d833d3b0791042a9a67df31114021d40692a9bb Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Mon, 22 Feb 2021 22:14:06 +0000 Subject: [PATCH 3/5] Translated using Weblate (French) Currently translated at 99.7% (2699 of 2706 strings) --- resources/locales/messages.fr.xlf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index d0ee14eea8..660d328488 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,4 +1,4 @@ - +
@@ -7,8 +7,8 @@
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -1565,9 +1565,9 @@ Par champ web/prod/index.html.twig - + CGU::PDF CGU generated on %updated_on% and printed on %printed_on% - CGU::PDF CGU generated on %updated_on% and printed on %printed_on% + CGU Générée le %updated_on% et imprimé le %printed_on% Out/Module/PDFCgu.php From 02d6856842c3d910d5a9eb680c2aaa0322000327 Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Mon, 22 Feb 2021 22:24:55 +0000 Subject: [PATCH 4/5] Translated using Weblate (French) Currently translated at 99.7% (2699 of 2706 strings) --- resources/locales/messages.fr.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 660d328488..bda708c837 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1567,7 +1567,7 @@ CGU::PDF CGU generated on %updated_on% and printed on %printed_on% - CGU Générée le %updated_on% et imprimé le %printed_on% + CGU générée le %updated_on% et imprimée le %printed_on% Out/Module/PDFCgu.php From 5b33a222668d524dff2ab0b8488608bc4aa1d7fb Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Mon, 22 Feb 2021 22:22:12 +0000 Subject: [PATCH 5/5] Translated using Weblate (German) Currently translated at 99.8% (2701 of 2706 strings) --- resources/locales/messages.de.xlf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index ee580615b5..be6c04d4bc 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,4 +1,4 @@ - +
@@ -7,8 +7,8 @@
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -1565,9 +1565,9 @@ Nach Feld web/prod/index.html.twig - + CGU::PDF CGU generated on %updated_on% and printed on %printed_on% - CGU::PDF CGU generated on %updated_on% and printed on %printed_on% + Nutzungsbedingungen erzeugt %updated_on% und gedruckt %printed_on% Out/Module/PDFCgu.php