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

do not hide tab after users changes in roles 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1308843 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-04-03 12:19:38 +00:00
parent b3959eb1a5
commit cc038bd533
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,12 +165,8 @@ define("redback.roles",["jquery","order!utils","i18n","jquery.validate","order!k
} }
updateModifiedRoles=function(){ updateModifiedRoles=function(){
var modifiedRoles = getModifiedRoles(); var modifiedRoles = getModifiedRoles();
$.log("modifiedRoles:"+modifiedRoles); $.log("modifiedRoles:"+modifiedRoles);
openDialogConfirm(function(){ openDialogConfirm(function(){
for(i=0;i<modifiedRoles.length;i++){ for(i=0;i<modifiedRoles.length;i++){
var modifiedRole=modifiedRoles[i]; var modifiedRole=modifiedRoles[i];
@ -225,7 +221,6 @@ define("redback.roles",["jquery","order!utils","i18n","jquery.validate","order!k
mainContent.find("#roles-view-tabs #roles-view-tabs-a-roles-grid").tab("show"); mainContent.find("#roles-view-tabs #roles-view-tabs-a-roles-grid").tab("show");
activateRolesGridTab(); activateRolesGridTab();
removeMediumSpinnerImg(); removeMediumSpinnerImg();
} }
} }
); );
@ -244,24 +239,28 @@ define("redback.roles",["jquery","order!utils","i18n","jquery.validate","order!k
for (var i = 0; i < removed.length; i++) { for (var i = 0; i < removed.length; i++) {
$.log("add user:"+removed[i].username()); $.log("add user:"+removed[i].username());
currentRole.users.push(removed[i]); currentRole.users.push(removed[i]);
//role.modified(true);
role.usersModified(true); role.usersModified(true);
} }
selectedOtherUsers([]); selectedOtherUsers([]);
$("#role-collapse" ).removeClass("in");
$("#role-users-collapse" ).addClass("in");
activateRoleUsersEditTab(); activateRoleUsersEditTab();
} }
removeUser=function(){ removeUser=function(){
$.log("removeUser");
var added = currentRole.users.removeAll(selectedUsers()); var added = currentRole.users.removeAll(selectedUsers());
for (var i = 0; i < added.length; i++) { for (var i = 0; i < added.length; i++) {
currentRole.otherUsers.push(added[i]); currentRole.otherUsers.push(added[i]);
currentRole.removedUsers.push(added[i]); currentRole.removedUsers.push(added[i]);
//role.modified(true);
role.usersModified(true); role.usersModified(true);
} }
selectedUsers([]); selectedUsers([]);
activateRoleUsersEditTab() $("#role-collapse" ).removeClass("in");
$("#role-users-collapse" ).addClass("in");
activateRoleUsersEditTab();
} }
saveRoleDescription=function(){ saveRoleDescription=function(){
currentRole.updateDescription(); currentRole.updateDescription();
} }