hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
aynsix
2019-12-12 14:33:37 +04:00
parent 0fa7b64fb7 36bbfb424e
commit 48f78698cc
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Alchemy/Phrasea/Databox/Record/LegacyRecordRepository.php
View File

@@ -130,7 +130,7 @@ class LegacyRecordRepository implements RecordRepository
$selects = $this->getRecordSelects(); $selects = $this->getRecordSelects();
if($max_items){ if ($max_items) {
array_unshift($selects, 'sr.rid_parent as story_id'); array_unshift($selects, 'sr.rid_parent as story_id');
$subBuilder = $connection->createQueryBuilder(); $subBuilder = $connection->createQueryBuilder();
@@ -172,7 +172,7 @@ class LegacyRecordRepository implements RecordRepository
array_merge($subBuilder->getParameterTypes(), $builder->getParameterTypes()) array_merge($subBuilder->getParameterTypes(), $builder->getParameterTypes())
); );
}else{ } else {
array_unshift($selects, 's.rid_parent as story_id'); array_unshift($selects, 's.rid_parent as story_id');
$builder = $connection->createQueryBuilder(); $builder = $connection->createQueryBuilder();
@@ -185,6 +185,7 @@ class LegacyRecordRepository implements RecordRepository
's.rid_parent IN (:storyIds)', 's.rid_parent IN (:storyIds)',
'r.parent_record_id = 0' 'r.parent_record_id = 0'
) )
->orderBy('s.ord', 'ASC')
->setParameter('storyIds', $storyIds, Connection::PARAM_INT_ARRAY) ->setParameter('storyIds', $storyIds, Connection::PARAM_INT_ARRAY)
; ;

2
package.json
View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0", "normalize-css": "^2.1.0",
"npm": "^6.0.0", "npm": "^6.0.0",
"npm-modernizr": "^2.8.3", "npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.85-d", "phraseanet-production-client": "^0.34.86-d",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"tinymce": "^4.0.28", "tinymce": "^4.0.28",
"underscore": "^1.8.3", "underscore": "^1.8.3",

8
yarn.lock
View File

@@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0" js-cookie "^2.1.0"
pym.js "^1.3.1" pym.js "^1.3.1"
phraseanet-production-client@0.34.85-d: phraseanet-production-client@^0.34.86-d:
version "0.34.85-d" version "0.34.86-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.85-d.tgz#e62f42f3464b664a56c2f0af3d7f5e7f3fcff802" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.86-d.tgz#51e6c6fb17fcd2695cee90fb3d972c781057fd78"
integrity sha512-V1tlEq24RMoGWnH7wHV5N/hCUxNfCiDgNaobcwfQMi/Hhdi0Xm3a1qX135w4B5xWZKilSfKNMIateiFI46xadw== integrity sha512-12o7pcRZAJ/5Ote4DbkaRxLz2GIZBUcZf53FB+GHVFxhds5ia6UNDCPhYP5vX4hhHtO/Y6Mj/BOlOjnoyi+k1g==
dependencies: dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2" "@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6" "@turf/turf" "^5.1.6"