diff --git a/workflow/engine/controllers/processProxy.php b/workflow/engine/controllers/processProxy.php index 8c9d7e27a..e587ea95e 100644 --- a/workflow/engine/controllers/processProxy.php +++ b/workflow/engine/controllers/processProxy.php @@ -124,7 +124,7 @@ class ProcessProxy extends HttpProxyController function getUsers($params) { require_once 'classes/model/Users.php'; - $search = isset($params->search) ? $params->search: null; + $search = isset($params->search) ? $params->search: null; return Users::getAll($params->start, $params->limit, $search); } @@ -136,8 +136,8 @@ class ProcessProxy extends HttpProxyController function getGroups($params) { require_once 'classes/model/Groupwf.php'; - $search = isset($params['search']) ? $params['search']: null; - return Groupwf::getAll($params['start'], $params['limit'], $search); + $search = isset($params->search) ? $params->search: null; + return Groupwf::getAll($params->start, $params->limit, $search); } /** diff --git a/workflow/engine/templates/bpmn/processmap.js b/workflow/engine/templates/bpmn/processmap.js index c9ebb5265..e37c40eca 100755 --- a/workflow/engine/templates/bpmn/processmap.js +++ b/workflow/engine/templates/bpmn/processmap.js @@ -109,6 +109,22 @@ Ext.onReady ( function() { usersTaskGrid.on('contextmenu', function (evt) { evt.preventDefault(); }, this); + + function onDynaformsContextMenu(grid, rowIndex, e) { + e.stopEvent(); + var coords = e.getXY(); + usersTaskGridContextMenu.showAt([coords[0], coords[1]]); + } + + var usersTaskGridContextMenu = new Ext.menu.Menu({ + id: 'messageContextMenu', + items: [{ + text: _('ID_REMOVE'), + iconCls: 'button_menu_ext ss_sprite ss_delete', + handler: removeUsersTask + } + ] + }); //AD HOC var usersTaskAdHocStore = new Ext.data.GroupingStore( { @@ -177,22 +193,38 @@ Ext.onReady ( function() { }); - function onDynaformsContextMenu(grid, rowIndex, e) { + //connecting context menu to grid + usersTaskAdHocGrid.addListener('rowcontextmenu', onUsersTaskAdHocGridContextMenu,this); + + //by default the right click is not selecting the grid row over the mouse + //we need to set this four lines + usersTaskAdHocGrid.on('rowcontextmenu', function (grid, rowIndex, evt) { + var sm = grid.getSelectionModel(); + sm.selectRow(rowIndex, sm.isSelected(rowIndex)); + }, this); + + //prevent default + usersTaskGrid.on('contextmenu', function (evt) { + evt.preventDefault(); + }, this); + + function onUsersTaskAdHocGridContextMenu(grid, rowIndex, e) { e.stopEvent(); var coords = e.getXY(); - usersTaskGridContextMenu.showAt([coords[0], coords[1]]); + usersTaskAdHocGridContextMenu.showAt([coords[0], coords[1]]); } - var usersTaskGridContextMenu = new Ext.menu.Menu({ - id: 'messageContextMenu', + var usersTaskAdHocGridContextMenu = new Ext.menu.Menu({ + id: 'messagAdHocGrideContextMenu', items: [{ text: _('ID_REMOVE'), iconCls: 'button_menu_ext ss_sprite ss_delete', - handler: removeUsersTask + handler: removeUsersAdHocTask } ] }); + updateActorsGrids = function(){ } @@ -237,6 +269,48 @@ Ext.onReady ( function() { }); //}); } + + + function removeUsersAdHocTask(){ + + var usr_uid = Array(); + var tu_relation = Array(); + var rowsSelected = Ext.getCmp('usersTaskAdHocGrid').getSelectionModel().getSelections(); + + if( rowsSelected.length == 0 ) { + PMExt.error('', _('ID_NO_SELECTION_WARNING')); + return false; + } + + for(i=0; i