Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Olivier Lamy 2012-01-06 09:14:33 +00:00
parent 515d54e810
commit 230185791c
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
View File

@ -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");
}
});

4
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
View File

@ -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>