fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1670 from cheloheredia/BUG-11246

Browse Source 
BUG 11246 "P.M.2.0.46Testing11: Department's supervisor's flaws" SOLVED
This commit is contained in:
julceslauhub
2013-05-02 06:17:09 -07:00
parent 14e7c23a5b ea8cc3693c
commit 46a246a6ff
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
workflow/engine/templates/departments/departmentUsers.js
View File

@@ -341,10 +341,13 @@ DDLoadUsers = function(){
var records = ddSource.dragData.selections; var records = ddSource.dragData.selections;
var arrAux = new Array(); var arrAux = new Array();
for (var r=0; r < records.length; r++){ for (var r=0; r < records.length; r++){
arrAux[r] = records[r].data['USR_UID']; if (records[r].data['USR_SUPERVISOR']==false) {
arrAux[r] = records[r].data['USR_UID'];
}else{
PMExt.notify(_('ID_DEPARTMENTS'),_('ID_DELETE_SUPERVISOR'));
};
} }
DeleteDepartmentUser(arrAux,RefreshUsers,FailureProcess); DeleteDepartmentUser(arrAux,RefreshUsers,FailureProcess);
return true;
} }
}); });
@@ -427,7 +430,11 @@ RemoveGroupsAction = function(){
rowsSelected = assignedGrid.getSelectionModel().getSelections(); rowsSelected = assignedGrid.getSelectionModel().getSelections();
var arrAux = new Array(); var arrAux = new Array();
for(var a=0; a < rowsSelected.length; a++){ for(var a=0; a < rowsSelected.length; a++){
arrAux[a] = rowsSelected[a].get('USR_UID'); if (rowsSelected[a].get('USR_SUPERVISOR')==false) {
arrAux[a] = rowsSelected[a].get('USR_UID');
}else{
PMExt.notify(_('ID_DEPARTMENTS'),_('ID_DELETE_SUPERVISOR'));
};
} }
DeleteDepartmentUser(arrAux,RefreshUsers,FailureProcess); DeleteDepartmentUser(arrAux,RefreshUsers,FailureProcess);
}; };