svn commit: r1225865 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html

[ol...@apache.org]

Author: olamy
Date: Fri Dec 30 17:08:32 2011
New Revision: 1225865

URL: http://svn.apache.org/viewvc?rev=1225865&view=rev
Log:
display users with current role and with parents roles

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html?rev=1225865&r1=1225864&r2=1225865&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html Fri Dec 30 17:08:32 2011
@@ -122,8 +122,43 @@
   {{/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>