From: Olivier Lamy <olamy@apache.org>
Date: Fri, 30 Mar 2012 10:02:06 +0000 (+0000)
Subject: shortcut to users management
X-Git-Tag: archiva-1.4-M3~897
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f6b701ede41ab674205154a7eb24765f5d564f1f;p=archiva.git

shortcut to users management

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
index c8962a432..fd9af6332 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
@@ -138,6 +138,11 @@ function() {
         displayUploadArtifact();
         return;
       }
+
+      if (screen=='manage-users' && hasKarma('archiva-manage-users')){
+        displayUsersGrid();
+        return;
+      }
     }
     // by default display search screen
     displaySearch();
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
index 0193589dd..df70de7a8 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
@@ -70,7 +70,7 @@
     <ul class="nav nav-list" redback-permissions="{permissions: ['archiva-manage-users']}">
       <li class="nav-header">${$.i18n.prop('menu.users')}</li>
       <li style="display: none" redback-permissions="{permissions: ['archiva-manage-users']}">
-        <a href="#" id="menu-users-list-a" onclick="displayUsersGrid(this)">${$.i18n.prop('menu.users.manage')}</a>
+        <a href="#" id="menu-users-list-a" onclick="displayUsersGrid()">${$.i18n.prop('menu.users.manage')}</a>
       </li>
       <li style="display: none" redback-permissions="{permissions: ['archiva-manage-users']}">
         <a href="#" id="menu-roles-list-a" onclick="displayRolesGrid()">${$.i18n.prop('menu.users.roles')}</a>