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

Merged in dheeyi/processmaker/PM-1736 (pull request #1707)

Browse Source 
PM-1736 0016849: Can not delete Department, because it is not possible to remove the supervisor.
This commit is contained in:
Julio Cesar Laura Avendaño
2015-03-22 22:26:44 -04:00
parent 889a898721 9d28ee1216
commit 937568dc97
2 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/departments/departments_Ajax.php
View File

@@ -367,7 +367,7 @@ switch ($_POST['action']) {
$dep_manager = $_POST['USR_UID']; $dep_manager = $_POST['USR_UID'];
$dep_uid = $_POST['DEP_UID']; $dep_uid = $_POST['DEP_UID'];
$editDepartment['DEP_UID'] = $dep_uid; $editDepartment['DEP_UID'] = $dep_uid;
$editDepartment['DEP_MANAGER'] = $dep_manager; $editDepartment['DEP_MANAGER'] = (!isset($_POST['NO_DEP_MANAGER'])? $dep_manager : '');
$oDept = new Department(); $oDept = new Department();
$oDept->update( $editDepartment ); $oDept->update( $editDepartment );
$oDept->updateDepartmentManager( $dep_uid ); $oDept->updateDepartmentManager( $dep_uid );

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

@@ -71,6 +71,13 @@ Ext.onReady(function(){
disabled: true disabled: true
}); });
NoSupervisorButton = new Ext.Action({
text: _('ID_SET_NO_MANAGER'),
iconCls: 'button_menu_ext ss_sprite ss_user_edit',
handler: RemoveSupervisor,
disabled: true
});
backButton = new Ext.Action({ backButton = new Ext.Action({
text : _('ID_BACK'), text : _('ID_BACK'),
iconCls: 'button_menu_ext ss_sprite ss_arrow_redo', iconCls: 'button_menu_ext ss_sprite ss_arrow_redo',
@@ -133,12 +140,15 @@ Ext.onReady(function(){
switch(sm.getCount()){ switch(sm.getCount()){
case 0: Ext.getCmp('removeButton').disable(); case 0: Ext.getCmp('removeButton').disable();
supervisorButton.disable(); supervisorButton.disable();
NoSupervisorButton.disable();
break; break;
case 1: Ext.getCmp('removeButton').enable(); case 1: Ext.getCmp('removeButton').enable();
supervisorButton.enable(); supervisorButton.enable();
NoSupervisorButton.enable();
break; break;
default: Ext.getCmp('removeButton').enable(); default: Ext.getCmp('removeButton').enable();
supervisorButton.disable(); supervisorButton.disable();
NoSupervisorButton.disable();
break; break;
} }
} }
@@ -248,7 +258,7 @@ Ext.onReady(function(){
frame : false, frame : false,
columnLines : false, columnLines : false,
viewConfig : {forceFit:true}, viewConfig : {forceFit:true},
tbar: [editMembersButton,'-',supervisorButton,{xtype: 'tbfill'},'-',searchTextP,clearTextButtonP], tbar: [editMembersButton,'-',supervisorButton, NoSupervisorButton,{xtype: 'tbfill'},'-',searchTextP,clearTextButtonP],
//bbar: [{xtype: 'tbfill'},editMembersButton], //bbar: [{xtype: 'tbfill'},editMembersButton],
listeners: {rowdblclick: function(){ listeners: {rowdblclick: function(){
(availableGrid.hidden)? DoNothing() : RemoveGroupsAction(); (availableGrid.hidden)? DoNothing() : RemoveGroupsAction();
@@ -493,6 +503,7 @@ EditMembersAction = function(){
buttonsPanel.show(); buttonsPanel.show();
editMembersButton.disable(); editMembersButton.disable();
supervisorButton.disable(); supervisorButton.disable();
//NoSupervisorButton.disable();
UsersPanel.doLayout(); UsersPanel.doLayout();
}; };
@@ -502,10 +513,14 @@ CancelEditMembersAction = function(){
buttonsPanel.hide(); buttonsPanel.hide();
editMembersButton.enable(); editMembersButton.enable();
rowsSelected = assignedGrid.getSelectionModel().getSelections(); rowsSelected = assignedGrid.getSelectionModel().getSelections();
if (rowsSelected.length == 1) if (rowsSelected.length == 1){
supervisorButton.enable(); supervisorButton.enable();
else NoSupervisorButton.enable();
supervisorButton.disable(); }
else{
supervisorButton.disable();
NoSupervisorButton.disable();
}
UsersPanel.doLayout(); UsersPanel.doLayout();
}; };
@@ -516,6 +531,26 @@ show_user = function(v,i,s){
return sName; return sName;
}; };
//Removes assignment Manager on Department(Desetea)
RemoveSupervisor = function(){
rowsSelected = assignedGrid.getSelectionModel().getSelections();
viewport.getEl().mask(_('ID_PROCESSING'));
Ext.Ajax.request({
url: 'departments_Ajax',
params: {action: 'updateSupervisor', USR_UID: rowsSelected[0].get('USR_UID'), DEP_UID: DEPARTMENT.DEP_UID, NO_DEP_MANAGER:'0'},
success: function(r,o){
viewport.getEl().unmask();
supervisorButton.disable();
NoSupervisorButton.disable();
DoSearchP();
PMExt.notify(_('ID_DEPARTMENTS'),_('ID_NO_SET_MANAGER_SUCCES'));
},
failure: function (r,o){
viewport.getEl().unmask();
}
});
};
//Update Department Supervisor //Update Department Supervisor
UpdateSupervisor = function(){ UpdateSupervisor = function(){
rowsSelected = assignedGrid.getSelectionModel().getSelections(); rowsSelected = assignedGrid.getSelectionModel().getSelections();
@@ -526,6 +561,7 @@ UpdateSupervisor = function(){
success: function(r,o){ success: function(r,o){
viewport.getEl().unmask(); viewport.getEl().unmask();
supervisorButton.disable(); supervisorButton.disable();
NoSupervisorButton.disable();
DoSearchP(); DoSearchP();
PMExt.notify(_('ID_DEPARTMENTS'),_('ID_SET_MANAGER_SUCCESS')); PMExt.notify(_('ID_DEPARTMENTS'),_('ID_SET_MANAGER_SUCCESS'));
}, },