From: Olivier Lamy <olamy@apache.org>
Date: Fri, 6 Jan 2012 09:14:33 +0000 (+0000)
Subject: add ids for selenium tests and force tab activation as webkit tend to fail
X-Git-Tag: archiva-1.4-M3~1634
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=230185791c50919df51c0bd391c3dd822e2a61d5;p=archiva.git

add ids for selenium tests and force tab activation as webkit tend to fail

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

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 54eed7d79..bd113eda6 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
@@ -163,6 +163,7 @@ $(function() {
         currentRole.users.push(removed[i]);
       }
       selectedOtherUsers([]);
+      activateRoleUsersEditTab();
     }
 
     removeUser=function(){
@@ -172,7 +173,7 @@ $(function() {
         currentRole.removedUsers.push(added[i]);
       }
       selectedUsers([]);
-
+      activateRoleUsersEditTab()
     }
     saveRoleDescription=function(){
       $.log("saveRoleDescription:"+currentRole.description());
@@ -237,4 +238,21 @@ $(function() {
     $("#roles-view-tabs-li-roles-edit").addClass("active");
   }
 
+  activateRoleUsersListTab=function(){
+    $("#main-content #role-edit-users-li").removeClass("active");
+    $("#main-content #role-edit-users").removeClass("active");
+    // activate roles grid tab
+    $("#main-content #role-view-users-li").addClass("active");
+    $("#main-content #role-view-users").addClass("active");
+  }
+
+  activateRoleUsersEditTab=function(){
+    $("#main-content #role-view-users-li").removeClass("active");
+    $("#main-content #role-view-users").removeClass("active");
+    // activate role edit tab
+    $("#main-content #role-edit-users").addClass("active");
+    $("#role-edit-users-li").addClass("active");
+  }
+
+
 });
\ No newline at end of file
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
index 7f1ed50c3..b92be860c 100644
--- 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
@@ -117,10 +117,10 @@
   {{/if}}
 
   <ul id="role-edit-users-tabs" class="pills">
-    <li class="active">
+    <li class="active" id="role-view-users-li">
       <a href="#role-view-users">${$.i18n.prop('role.edit.users.list')}</a>
     </li>
-    <li>
+    <li id="role-edit-users-li">
       <a href="#role-edit-users">${$.i18n.prop('edit')}</a>
     </li>
   </ul>