From 713108078843350d3a89c352252edb7908a42127 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Wed, 11 Dec 2019 18:26:44 +0400 Subject: [PATCH 1/2] PHRAS-2856 #comment Fix prod Basket and story : Set records order --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index fe943aebfb..7525421e67 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.85-d", + "phraseanet-production-client": "^0.34.86-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/yarn.lock b/yarn.lock index f97d972cc3..a7d490caab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.85-d: - version "0.34.85-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.85-d.tgz#e62f42f3464b664a56c2f0af3d7f5e7f3fcff802" - integrity sha512-V1tlEq24RMoGWnH7wHV5N/hCUxNfCiDgNaobcwfQMi/Hhdi0Xm3a1qX135w4B5xWZKilSfKNMIateiFI46xadw== +phraseanet-production-client@^0.34.86-d: + version "0.34.86-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.86-d.tgz#51e6c6fb17fcd2695cee90fb3d972c781057fd78" + integrity sha512-12o7pcRZAJ/5Ote4DbkaRxLz2GIZBUcZf53FB+GHVFxhds5ia6UNDCPhYP5vX4hhHtO/Y6Mj/BOlOjnoyi+k1g== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 5a703f207ae9dab9f1b0d6d70b20d86744d5c020 Mon Sep 17 00:00:00 2001 From: aynsix Date: Thu, 12 Dec 2019 12:13:56 +0400 Subject: [PATCH 2/2] fix record order in story --- lib/Alchemy/Phrasea/Databox/Record/LegacyRecordRepository.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Alchemy/Phrasea/Databox/Record/LegacyRecordRepository.php b/lib/Alchemy/Phrasea/Databox/Record/LegacyRecordRepository.php index 522d49baae..9924b8be94 100644 --- a/lib/Alchemy/Phrasea/Databox/Record/LegacyRecordRepository.php +++ b/lib/Alchemy/Phrasea/Databox/Record/LegacyRecordRepository.php @@ -140,6 +140,7 @@ class LegacyRecordRepository implements RecordRepository 's.rid_parent IN (:storyIds)', 'r.parent_record_id = 0' ) + ->orderBy('s.ord', 'ASC') ->setParameter('storyIds', $storyIds, Connection::PARAM_INT_ARRAY) ;