From 1d66b47f5fe7cc364b486312a947ccaa393ddc5c Mon Sep 17 00:00:00 2001
From: Vec7or <carlo@kirchmeier.co>
Date: Wed, 30 Dec 2020 17:33:24 +0100
Subject: [PATCH] Fix tag-colors inside inherited acl

---
 .../java/com/sismics/docs/rest/resource/DocumentResource.java   | 2 ++
 .../main/webapp/src/partial/docs/document.view.permissions.html | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs-web/src/main/java/com/sismics/docs/rest/resource/DocumentResource.java b/docs-web/src/main/java/com/sismics/docs/rest/resource/DocumentResource.java
index 4a35c1c1..8200f9f5 100644
--- a/docs-web/src/main/java/com/sismics/docs/rest/resource/DocumentResource.java
+++ b/docs-web/src/main/java/com/sismics/docs/rest/resource/DocumentResource.java
@@ -104,6 +104,7 @@ public class DocumentResource extends BaseResource {
      * @apiSuccess {String="READ","WRITE"} inherited_acls.perm Permission
      * @apiSuccess {String} inherited_acls.source_id Source ID
      * @apiSuccess {String} inherited_acls.source_name Source name
+     * @apiSuccess {String} inherited_acls.source_color The color of the Source
      * @apiSuccess {String} inherited_acls.id ID
      * @apiSuccess {String} inherited_acls.name Target name
      * @apiSuccess {String="USER","GROUP","SHARE"} inherited_acls.type Target type
@@ -196,6 +197,7 @@ public class DocumentResource extends BaseResource {
                             .add("perm", aclDto.getPerm().name())
                             .add("source_id", tagDto.getId())
                             .add("source_name", tagDto.getName())
+                            .add("source_color", tagDto.getColor())
                             .add("id", aclDto.getTargetId())
                             .add("name", JsonUtil.nullable(aclDto.getTargetName()))
                             .add("type", aclDto.getTargetType()));
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.view.permissions.html b/docs-web/src/main/webapp/src/partial/docs/document.view.permissions.html
index 016b866d..a39998b5 100644
--- a/docs-web/src/main/webapp/src/partial/docs/document.view.permissions.html
+++ b/docs-web/src/main/webapp/src/partial/docs/document.view.permissions.html
@@ -22,7 +22,7 @@
     <tr ng-repeat="(id, acl) in inheritedAcls">
       <td>
         <a href="#/tag/{{ acl[0].source_id }}">
-          <span class="fas fa-tags"></span>&nbsp;
+          <span class="fas fa-tags" ng-style="{ 'color': acl[0].source_color }"></span>&nbsp;
           {{ acl[0].source_name }}
         </a>
       </td>