From 30cae342831ed0e1d8dafe1aad0f705a66d6ad57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lex=20Hermida?= <alexhermida@gmail.com>
Date: Mon, 23 Apr 2018 11:43:30 +0200
Subject: [PATCH] Refactor readonly templates

---
 app/coffee/modules/common/lightboxes.coffee   |  2 +-
 .../common/components/assigned-users.jade     | 22 +++++----
 .../lightbox/lightbox-assigned-to-users.jade  | 18 ++++---
 .../lightbox-assigned-users-users.jade        | 48 +++++++++++++++++++
 4 files changed, 69 insertions(+), 21 deletions(-)
 create mode 100644 app/partials/common/lightbox/lightbox-assigned-users-users.jade

diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee
index 09d534ec..8b203d32 100644
--- a/app/coffee/modules/common/lightboxes.coffee
+++ b/app/coffee/modules/common/lightboxes.coffee
@@ -703,7 +703,7 @@ AssignedUsersLightboxDirective = ($repo, lightboxService, lightboxKeyboardNaviga
     link = ($scope, $el, $attrs) ->
         selectedUsers = []
         selectedItem = null
-        usersTemplate = $template.get("common/lightbox/lightbox-assigned-to-users.html", true)
+        usersTemplate = $template.get("common/lightbox/lightbox-assigned-users-users.html", true)
 
         normalizeString = (string) ->
             normalizedString = string
diff --git a/app/partials/common/components/assigned-users.jade b/app/partials/common/components/assigned-users.jade
index eb37fdc8..8f2a772f 100644
--- a/app/partials/common/components/assigned-users.jade
+++ b/app/partials/common/components/assigned-users.jade
@@ -12,7 +12,7 @@
             //- .iocaine-symbol(ng-if="isIocaine" title="{{ 'TASK.TITLE_ACTION_IOCAINE' | translate }}")
             //- tg-svg(svg-icon="icon-iocaine")
         .assigned-to
-            .assigned-users-options
+            .assigned-users-options(ng-if="isEditable")
                 a(
                     href=""
                     title="{{ 'COMMON.ASSIGNED_TO.TITLE_ACTION_EDIT_ASSIGNMENT'|translate }}"
@@ -22,14 +22,15 @@
                 )
                     span.assigned-name {{ "COMMON.ASSIGNED_TO.ASSIGN" | translate }}
 
-                span(translate="COMMON.OR")
-                | &nbsp;
-                a.assign-to-me(
-                    href="#"
-                    title="{{'COMMON.ASSIGNED_TO.SELF' | translate}}"
-                    ng-click="assignToMe()"
-                )
-                    span {{ "COMMON.ASSIGNED_TO.SELF" | translate }}
+                span(ng-if="!isAssigned")
+                    span(translate="COMMON.OR")
+                    | &nbsp;
+                    a.assign-to-me(
+                        href="#"
+                        title="{{'COMMON.ASSIGNED_TO.SELF' | translate}}"
+                        ng-click="assignToMe()"
+                    )
+                        span {{ "COMMON.ASSIGNED_TO.SELF" | translate }}
 
     .user-list-single(ng-repeat="assignedUser in assignedUsers")
         .user-list-avatar
@@ -51,7 +52,8 @@
                 title="{{'COMMON.ASSIGNED_TO.DELETE_ASSIGNMENT' | translate}}"
             )
 
-.tg-add-assigned(ng-if="isAssigned")
+
+.tg-add-assigned(ng-if="isAssigned && isEditable")
     tg-svg.add-assigned(
                 ng-if="isEditable",
                 data-assigned-user-id="{{assignedUser.id}}",
diff --git a/app/partials/common/lightbox/lightbox-assigned-to-users.jade b/app/partials/common/lightbox/lightbox-assigned-to-users.jade
index 2ec6eb4d..16c06377 100644
--- a/app/partials/common/lightbox/lightbox-assigned-to-users.jade
+++ b/app/partials/common/lightbox/lightbox-assigned-to-users.jade
@@ -1,27 +1,25 @@
-//- <% if (selected) { %>
-<% _.each(selected, function(user) { %>
-.user-list-multiple.is-active(data-user-id!="<%- user.id %>")
+<% if (selected) { %>
+.user-list-single.is-active
     .user-list-avatar
         a(
             href=""
             title="{{'COMMON.ASSIGNED_TO' | translate}}"
         )
             img(
-                style!="background: <%- user.avatar.bg %>"
-                src!="<%- user.avatar.url %>"
+                style!="background: <%- selected.avatar.bg %>"
+                src!="<%- selected.avatar.url %>"
             )
     a.user-list-name(
         href=""
-        title!="<%- user.full_name_display %>"
+        title!="<%- selected.full_name_display %>"
         ng-non-bindable
     )
-        | <%-user.full_name_display %>
+        | <%-selected.full_name_display %>
     tg-svg.remove-assigned-to(
         svg-icon="icon-close",
-        svg-title-translate="COMMON.ASSIGNED_TO.REMOVE_ASSIGNED",
-        data-user-id!="<%- user.id %>"
+        svg-title-translate="COMMON.ASSIGNED_TO.REMOVE_ASSIGNED"
     )
-<% }) %>
+<% } %>
 
 <% _.each(users, function(user) { %>
 .user-list-single(data-user-id!="<%- user.id %>")
diff --git a/app/partials/common/lightbox/lightbox-assigned-users-users.jade b/app/partials/common/lightbox/lightbox-assigned-users-users.jade
new file mode 100644
index 00000000..2ec6eb4d
--- /dev/null
+++ b/app/partials/common/lightbox/lightbox-assigned-users-users.jade
@@ -0,0 +1,48 @@
+//- <% if (selected) { %>
+<% _.each(selected, function(user) { %>
+.user-list-multiple.is-active(data-user-id!="<%- user.id %>")
+    .user-list-avatar
+        a(
+            href=""
+            title="{{'COMMON.ASSIGNED_TO' | translate}}"
+        )
+            img(
+                style!="background: <%- user.avatar.bg %>"
+                src!="<%- user.avatar.url %>"
+            )
+    a.user-list-name(
+        href=""
+        title!="<%- user.full_name_display %>"
+        ng-non-bindable
+    )
+        | <%-user.full_name_display %>
+    tg-svg.remove-assigned-to(
+        svg-icon="icon-close",
+        svg-title-translate="COMMON.ASSIGNED_TO.REMOVE_ASSIGNED",
+        data-user-id!="<%- user.id %>"
+    )
+<% }) %>
+
+<% _.each(users, function(user) { %>
+.user-list-single(data-user-id!="<%- user.id %>")
+    .user-list-avatar
+        a(
+            href="#"
+            title="{{'COMMON.ASSIGNED_TO.TITLE' | translate}}"
+        )
+            img(
+                style!="background: <%- user.avatar.bg %>"
+                src!="<%- user.avatar.url %>"
+            )
+    a.user-list-name(
+        href=""
+        title!="<%- user.full_name_display %>"
+        ng-non-bindable
+    )
+        | <%- user.full_name_display %>
+<% }) %>
+
+<% if (showMore) { %>
+.more-watchers
+    span(translate="COMMON.ASSIGNED_TO.TOO_MANY")
+<% } %>