From: Olivier Lamy <olamy@apache.org>
Date: Fri, 30 Dec 2011 17:08:32 +0000 (+0000)
Subject: display users with current role and with parents roles
X-Git-Tag: archiva-1.4-M3~1670
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a58cd7ef9bd8545f2de0a1a1464b756a51e2803b;p=archiva.git

display users with current role and with parents roles

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1225865 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
index bea2ef35d..4b242335d 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
@@ -121,9 +121,44 @@
     </table>
   {{/if}}
 
+  <div class="page-header">
+    <h2>${$.i18n.prop('role.edit.section.users')}</h2>
+  </div>
+  {{if parentsRolesUsers}}
+    <div class="page-header">
+      <h3>${$.i18n.prop('role.edit.users.defined.in.parent.roles')}</h3>
+    </div>
+    {{if $.isArray(parentsRolesUsers)}}
+      <ul>
+      {{each parentsRolesUsers}}
+        <li>${$value.fullName} - ( ${$value.username} - ${$value.email} ) </li>
+      {{/each}}
+      </ul>
+    {{else}}
+      <ul>
+        <li>${parentsRolesUsers.fullName} - ( ${parentsRolesUsers.username} - ${parentsRolesUsers.email} ) </li>
+      </ul>
+    {{/if}}
+  {{/if}}
+
   <div class="page-header">
     <h3>${$.i18n.prop('role.edit.users.defined.in.current.role')}</h3>
   </div>
 
+  {{if users}}
+    {{if $.isArray(users)}}
+      <ul>
+      {{each users}}
+        <li>${$value.fullName} - ( ${$value.username} - ${$value.email} ) </li>
+      {{/each}}
+      </ul>
+    {{else}}
+      <ul>
+        <li>${users.fullName} - ( ${users.username} - ${users.email} ) </li>
+      </ul>
+    {{/if}}
+  {{else}}
+    ${$.i18n.prop('role.edit.no.user.defined')}
+  {{/if}}
 
 </script>