From c8ac77839cc315d2338478868ac3f515c603b4ce Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 26 Dec 2011 15:06:41 +0000 Subject: [PATCH] display roles in a table git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1224735 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/webapp/js/redback/redback-tmpl.js | 6 ++++-- .../src/main/webapp/js/redback/roles.js | 4 ++++ .../js/redback/templates/roles-tmpl.html | 18 ++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js index 0fed206a7..ff7537db7 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js @@ -18,8 +18,8 @@ */ require(["text!redback/templates/user-edit.html", "text!redback/templates/user-grids.html", "text!redback/templates/login.html" , "text!redback/templates/register-form.html","text!redback/templates/password-change-form.html" - ,"text!redback/templates/user-edit-form.html"], - function(usercreate, usergrids, login,register,passwordchange,useredit) { + ,"text!redback/templates/user-edit-form.html","text!redback/templates/roles-tmpl.html"], + function(usercreate, usergrids, login,register,passwordchange,useredit,roles_tmpl) { $.tmpl( login, $.i18n.map ).appendTo("#html-fragments"); @@ -29,5 +29,7 @@ require(["text!redback/templates/user-edit.html", "text!redback/templates/user-g // template loading $("#html-fragments").append(usercreate); $("#html-fragments").append(usergrids); + $("#html-fragments").append(roles_tmpl); + } ); \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js index f28b59216..c7a84b888 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js @@ -24,6 +24,8 @@ $(function() { } displayRolesGrid = function(){ + $("#user-messages").html(""); + $("#main-content").html(""); $.ajax("restServices/redbackServices/roleManagementService/allRoles", { type: "GET", @@ -33,6 +35,8 @@ $(function() { var roles = $.map(data.role, function(item) { return mapRole(item); }); + $("#main-content").html($("#rolesGrid").tmpl(data)); + } } ); 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 new file mode 100644 index 000000000..e2bda0e41 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html @@ -0,0 +1,18 @@ + \ No newline at end of file -- 2.39.5