display assignedRoles for a user in user edition

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

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 115b3cb979f0e356a0af48cad7c4eb75d3bd3cdd..0c7c74d84174118d52f9eca9bfab578ae8377769 100644 (file)
--- 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
@@ -1,4 +1,7 @@
 <script id='redback/user-edit-tmpl' type='text/x-jquery-tmpl'>
+
+  <div class="row">
+    <div class="span10 columns">
     <form id="user-create">
       <fieldset id="user-create-fieldset">
         <div class="clearfix">
@@ -57,4 +60,14 @@
       <button data-bind="click: save" class="btn" id="user-create-form-register-button">${i18n('save')}</button>
       <button class="btn" id="user-create-form-cancel-button">${i18n('cancel')}</button>
     </form>
+    </div>
+    <div class="span6 columns" id="user-edit-roles-view" style="display:none">
+      <div class="page-header">
+        <h3>${$.i18n.prop('effective.roles')}</h3>
+      </div>
+    </div>
+  </div>
+
 </script>
+
+

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
index f4c655122e90384bae36ab4eb4f65fa8473b28e8..704cb068c7d7ac64167f387c9892f57551dac701 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
@@ -109,3 +109,9 @@
       <div id="createUserForm"></div>
     </div>
 </script>
+
+<script id="user_edit_roles_tmpl" type="text/x-jquery-tmpl">
+  <ul>
+    ${name}
+  </ul>
+</script>

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
index 710fa5c856203aad9998f6053c24f4a0e2a3fa95..f0466dc4574b4611e42385a548ba847ad5c16376 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
@@ -113,14 +113,8 @@ $(function() {
     this.editUserBox=function(user) {
       window.redbackModel.createUser=false;
       clearUserMessages();
-      //$("#main-content #user-edit").remove();
-      $("#main-content").append("<div id='user-edit'></div>");
-      //$("#main-content #user-edit").attr("data-bind",'template: {name:"redback/user-edit-tmpl",data: user}');
       $("#main-content #createUserForm").attr("data-bind",'template: {name:"redback/user-edit-tmpl",data: user}');
 
-      //$("#main-content #user-create").remove();
-      //$("#main-content #user-edit").show();
-
       var viewModel = new userViewModel(user);
 
       ko.applyBindings(viewModel,$("#main-content #createUserForm").get(0));
@@ -153,6 +147,17 @@ $(function() {
         user.update();
       });
 
+      $.ajax("restServices/redbackServices/roleManagementService/getEffectivelyAssignedRoles/"+user.username(), {
+          type: "GET",
+          async: false,
+          dataType: 'json',
+          success: function(data) {
+            $( "#user-edit-roles-view" ).append( jQuery("#user_edit_roles_tmpl" ).tmpl( data.role ) );
+            $("#user-edit-roles-view").show();
+          }
+        }
+      );
+
     }
   }