From 1057cb0493d4bb2783c48771c25aed44a1f3726d Mon Sep 17 00:00:00 2001 From: aynsix Date: Wed, 3 Jun 2020 17:52:21 +0300 Subject: [PATCH 1/4] fix issuee whe trying to rebuild subdef from tool --- .../Subscriber/RecordSubscriber.php | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/lib/Alchemy/Phrasea/WorkerManager/Subscriber/RecordSubscriber.php b/lib/Alchemy/Phrasea/WorkerManager/Subscriber/RecordSubscriber.php index c0df49717d..429aebe46c 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Subscriber/RecordSubscriber.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Subscriber/RecordSubscriber.php @@ -54,18 +54,20 @@ class RecordSubscriber implements EventSubscriberInterface if (!$record->isStory()) { $subdefs = $record->getDatabox()->get_subdef_structure()->getSubdefGroup($record->getType()); - foreach ($subdefs as $subdef) { - $payload = [ - 'message_type' => MessagePublisher::SUBDEF_CREATION_TYPE, - 'payload' => [ - 'recordId' => $event->getRecord()->getRecordId(), - 'databoxId' => $event->getRecord()->getDataboxId(), - 'subdefName' => $subdef->get_name(), - 'status' => $event->isNewRecord() ? MessagePublisher::NEW_RECORD_MESSAGE : '' - ] - ]; + if ($subdefs !==null) { + foreach ($subdefs as $subdef) { + $payload = [ + 'message_type' => MessagePublisher::SUBDEF_CREATION_TYPE, + 'payload' => [ + 'recordId' => $event->getRecord()->getRecordId(), + 'databoxId' => $event->getRecord()->getDataboxId(), + 'subdefName' => $subdef->get_name(), + 'status' => $event->isNewRecord() ? MessagePublisher::NEW_RECORD_MESSAGE : '' + ] + ]; - $this->messagePublisher->publishMessage($payload, MessagePublisher::SUBDEF_QUEUE); + $this->messagePublisher->publishMessage($payload, MessagePublisher::SUBDEF_QUEUE); + } } } } From 952388aba1dc08624155f939d1570d60dc90d7c6 Mon Sep 17 00:00:00 2001 From: aynsix Date: Wed, 3 Jun 2020 17:55:39 +0300 Subject: [PATCH 2/4] add espace --- .../Phrasea/WorkerManager/Subscriber/RecordSubscriber.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/WorkerManager/Subscriber/RecordSubscriber.php b/lib/Alchemy/Phrasea/WorkerManager/Subscriber/RecordSubscriber.php index 429aebe46c..cf0a3b940c 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Subscriber/RecordSubscriber.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Subscriber/RecordSubscriber.php @@ -54,7 +54,7 @@ class RecordSubscriber implements EventSubscriberInterface if (!$record->isStory()) { $subdefs = $record->getDatabox()->get_subdef_structure()->getSubdefGroup($record->getType()); - if ($subdefs !==null) { + if ($subdefs !== null) { foreach ($subdefs as $subdef) { $payload = [ 'message_type' => MessagePublisher::SUBDEF_CREATION_TYPE, From e47312f02e7743215d68d1cabe93ccf235217db8 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 5 Jun 2020 13:32:53 +0400 Subject: [PATCH 3/4] PHRAS-3125 Fix on basket browser display --- package.json | 2 +- templates/web/prod/WorkZone/Browser/Basket.html.twig | 8 ++++---- templates/web/prod/WorkZone/Browser/Results.html.twig | 4 ++-- yarn.lock | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 062865c82a..76aa058cd1 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.214-d", + "phraseanet-production-client": "0.34.218-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/templates/web/prod/WorkZone/Browser/Basket.html.twig b/templates/web/prod/WorkZone/Browser/Basket.html.twig index 2618d70e22..4ac0e0f25e 100644 --- a/templates/web/prod/WorkZone/Browser/Basket.html.twig +++ b/templates/web/prod/WorkZone/Browser/Basket.html.twig @@ -1,6 +1,6 @@
- +
diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig index 9ac3a5fa06..ee9f1f5d18 100644 --- a/templates/web/prod/WorkZone/Browser/Results.html.twig +++ b/templates/web/prod/WorkZone/Browser/Results.html.twig @@ -40,8 +40,8 @@   {% endif %} - - {{ Basket.getName() }} + + {{ Basket.getName()|length > 80 ? Basket.getName()|slice(0, 77) ~ '...' : Basket.getName() }}
{{ Basket.getElements().count() }} {{ ' records' }} diff --git a/yarn.lock b/yarn.lock index f641a68101..7050a03240 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7578,10 +7578,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.214-d: - version "0.34.214-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.214-d.tgz#55675c3925c81626ddd8b9498e02c9d106a51d93" - integrity sha512-RXg7KMgpPtv4rR3c2tCNMr7RgneAZjvBbFyGVx+a42nPkkZMnulweDm1R2o5d/eOcW6uJWPWczSmCCS0GqNnVQ== +phraseanet-production-client@0.34.218-d: + version "0.34.218-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.218-d.tgz#6a5c1686a3c2bf5e334adb962fdd529c9bd59bae" + integrity sha512-rU5a/7fqhA8CIcWUicBAhRIO8Ga50V6PRiOnPMXnCxZfQWccG/sFbLSbvA2Sa+58eNSRhf7Z2QNu+S90KgoW1g== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 659cb69c70ca08e645be21fed06cdf7716c2d917 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 5 Jun 2020 15:19:01 +0400 Subject: [PATCH 4/4] PHRAS-3125 upgrade phraseanet-production-client --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 76aa058cd1..20d2c861a9 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.218-d", + "phraseanet-production-client": "0.34.219-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/yarn.lock b/yarn.lock index 7050a03240..2940fd971a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7578,10 +7578,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.218-d: - version "0.34.218-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.218-d.tgz#6a5c1686a3c2bf5e334adb962fdd529c9bd59bae" - integrity sha512-rU5a/7fqhA8CIcWUicBAhRIO8Ga50V6PRiOnPMXnCxZfQWccG/sFbLSbvA2Sa+58eNSRhf7Z2QNu+S90KgoW1g== +phraseanet-production-client@0.34.219-d: + version "0.34.219-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.219-d.tgz#9bd118d0588af0ca58b60ef6b8f2514b6a9ffe63" + integrity sha512-QHLsPBRjtE4wSH5jib6gN71U70lAtoloM5E+NfmFKHLBMv0B8xqcxJKVW7EbRX4DZTpsLCu5tuZ7vzd5PpbkOg== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"
@@ -23,9 +23,9 @@ {% endif %} - - {{ Basket.getName() }} - + + {{ Basket.getName()|length > 55 ? Basket.getName()|slice(0, 52) ~ '...' : Basket.getName() }} +