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

resolve conflict

Browse Source
This commit is contained in:
Mike Ng
2018-01-08 15:57:13 +04:00
parent bddc3781ba
commit 30f49bdd35
27 changed files with 564 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Alchemy/Phrasea/Controller/Prod/MoveCollectionController.php
View File

@@ -41,7 +41,7 @@ class MoveCollectionController extends Controller
$settings = $this->app['settings'];
$userOrderSetting = $settings->getUserSetting($this->app->getAuthenticatedUser(), 'order_collection_by');
// a temporary array to sort the collections
$aName = array();
$aName = [];
list($ukey, $uorder) = ["order", SORT_ASC]; // default ORDER_BY_ADMIN
switch ($userOrderSetting) {
case $settings::ORDER_ALPHA_ASC :
@@ -52,9 +52,10 @@ class MoveCollectionController extends Controller
break;
}
foreach ($collections as $key => $row) {
if($ukey == "order") {
if ($ukey == "order") {
$aName[$key] = $row->get_ord();
}else {
}
else {
$aName[$key] = $row->get_name();
}
}