From: Olivier Lamy <olamy@apache.org>
Date: Thu, 12 Jan 2012 14:12:32 +0000 (+0000)
Subject: user roles edit display roles from templates/resources
X-Git-Tag: archiva-1.4-M3~1605
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4812edab08cf67c5116e1256a95c6cef518dc2d1;p=archiva.git

user roles edit display roles from templates/resources

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
index b2e3bd57a..a3c2aad23 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
@@ -206,4 +206,11 @@ mapStringArray=function(data){
     }
   }
   return null;
-}
\ No newline at end of file
+}
+
+// extends jquery tmpl to support var def
+$.extend($.tmpl.tag, {
+    "var": {
+        open: "var $1;"
+    }
+});
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
index 94f39d624..cd14299f2 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
@@ -109,9 +109,34 @@
       </blockquote>
       <ul>
       {{each $value.globalRoles}}
-        <li><div><input type="checkbox" value="${$value}" data-bind="checked: user.assignedRoles" />&nbsp;${$value}</div></li>
+        <li><input type="checkbox" value="${$value}" data-bind="checked: user.assignedRoles">&nbsp;${$value}</input></li>
       {{/each}}
       </ul>
+
+      {{if roleTemplates}}
+      <table class="bordered-table">
+        <thead>
+          <tr>
+            <th>&nbsp;</th>
+            {{each roleTemplates}}
+              <th>${$value.namePrefix}</th>
+            {{/each}}
+          </tr>
+        </thead>
+        <tbody>
+          {{each resources}}
+            {{var curResource = $value}}
+            <tr>
+              <td>${curResource}</td>
+              {{each roleTemplates}}
+                <td><input type="checkbox" value="${$value.namePrefix}${$value.delimiter}${curResource}" data-bind="checked: user.assignedRoles"/></td>
+              {{/each}}
+            </tr>
+          {{/each}}
+        </tbody>
+      </table>
+      {{/if}}
+
     {{/each}}
 
     <button class="btn" data-bind="click:updateUserRoles">${$.i18n.prop('update')}</button>