From 7833ae424712feff32c44894b021b83f7322ea0c Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 24 Jan 2020 15:57:00 +0100
Subject: [PATCH] FIX #12091 TIME 0:10 display badge folder in folder list
---
src/app/folder/controllers/FolderController.php | 1 +
.../folder-document-list.component.html | 3 +++
.../folder-document-list.component.scss | 14 ++++++++++++++
3 files changed, 18 insertions(+)
diff --git a/src/app/folder/controllers/FolderController.php b/src/app/folder/controllers/FolderController.php
index 446b93c42bd..a392590c31c 100755
--- a/src/app/folder/controllers/FolderController.php
+++ b/src/app/folder/controllers/FolderController.php
@@ -575,6 +575,7 @@ class FolderController
'attachments' => $attachments,
'checkLocked' => false,
'trackedMails' => $followedResources,
+ 'listDisplay' => ['folders']
]);
}
diff --git a/src/frontend/app/folder/document-list/folder-document-list.component.html b/src/frontend/app/folder/document-list/folder-document-list.component.html
index 481c1d5294d..90cbf1dda64 100644
--- a/src/frontend/app/folder/document-list/folder-document-list.component.html
+++ b/src/frontend/app/folder/document-list/folder-document-list.component.html
@@ -168,6 +168,9 @@
</button>
</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 | sortBy : 'label'" routerLink="/folders/{{folder.id}}" title="{{lang.goToFolder}} : {{folder.label}}"><i class="fa fa-folder"></i> {{folder.label}}</span>
+ </div>
</td>
</ng-container>
<tr mat-row *matRowDef="let row; columns: displayedColumnsBasket;"
diff --git a/src/frontend/app/folder/document-list/folder-document-list.component.scss b/src/frontend/app/folder/document-list/folder-document-list.component.scss
index 7a6af119a53..3c256aca35a 100644
--- a/src/frontend/app/folder/document-list/folder-document-list.component.scss
+++ b/src/frontend/app/folder/document-list/folder-document-list.component.scss
@@ -93,3 +93,17 @@
.followIcon {
color: $secondary;
}
+
+.folder-info {
+ padding-left: 20px;
+ padding-right: 20px;
+}
+
+.badge-folder {
+ cursor: pointer;
+ background: $secondary;
+ margin: 5px;
+ font-size: 12px;
+ border-radius: 3px;
+ opacity: 0.8;
+}
--
GitLab