diff --git a/src/app/folder/controllers/FolderController.php b/src/app/folder/controllers/FolderController.php index 096781569c85135ee2706f12f2b28b4f05b7926a..f68d64e8af6a7dbbadbb27a3ba778bcdb098880e 100755 --- a/src/app/folder/controllers/FolderController.php +++ b/src/app/folder/controllers/FolderController.php @@ -630,7 +630,7 @@ class FolderController 'select' => ['distinct (folders.id)', 'folders.*'], 'where' => $where, 'data' => $data, - 'orderBy' => ['level'] + 'orderBy' => ['level', 'label'] ]); return $folders; diff --git a/src/core/controllers/AutoCompleteController.php b/src/core/controllers/AutoCompleteController.php index c0b9a7152e8ab434cb1a987107a36776febf5d4c..037ea29543ca85e9369ad524948ca55f410acc51 100755 --- a/src/core/controllers/AutoCompleteController.php +++ b/src/core/controllers/AutoCompleteController.php @@ -687,11 +687,7 @@ class AutoCompleteController $scopedFolders = FolderController::getScopeFolders(['login' => $GLOBALS['userId']]); - $getScopedFoldersIds = function ($value) { - return $value['id']; - }; - - $arrScopedFoldersIds = array_map($getScopedFoldersIds, $scopedFolders); + $arrScopedFoldersIds = array_column($scopedFolders, 'id'); $selectedFolders = FolderModel::get([ 'where' => ['label ilike ? AND id IN(?)'], diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html index 7a9761c694373dc5003596157e8e5353e6e3a23d..a2413dbe6375f562dea9de98c4519cef164d97b0 100644 --- a/src/frontend/app/list/basket-list.component.html +++ b/src/frontend/app/list/basket-list.component.html @@ -167,7 +167,7 @@ </span> </div> <div *ngIf="row.folders !== undefined && row.folders.length > 0" class="folder-info"> - <span class="badge badge-folder" *ngFor="let folder of row.folders" routerLink="/folders/{{folder.id}}" title="Accéder au dossier : {{folder.label}}"><i class="fa fa-folder"></i> {{folder.label}}</span> + <span class="badge badge-folder" *ngFor="let folder of row.folders | sortBy : 'label'" routerLink="/folders/{{folder.id}}" title="Accéder au dossier : {{folder.label}}"><i class="fa fa-folder"></i> {{folder.label}}</span> </div> </td> </ng-container>