From 51466ffe48904b0820f270a00a61a5cc5e6625ad Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Wed, 4 Sep 2019 15:07:01 +0200
Subject: [PATCH] FEAT #11641 TIME 1:15 set order folder badges in lists +
change array_map to array_coll + fix order tree for parent folder
---
src/app/folder/controllers/FolderController.php | 2 +-
src/core/controllers/AutoCompleteController.php | 6 +-----
src/frontend/app/list/basket-list.component.html | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/app/folder/controllers/FolderController.php b/src/app/folder/controllers/FolderController.php
index 096781569c8..f68d64e8af6 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 c0b9a7152e8..037ea29543c 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 7a9761c6943..a2413dbe637 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>
--
GitLab