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

Merged in paulis/processmaker/HOR-1720 (pull request #4838)

Browse Source 
HOR-1720
This commit is contained in:
Julio Cesar Laura Avendaño
2016-08-30 17:46:10 -04:00
parent 00e12f026f 70dd6bae4e
commit e2bdd159a1
11 changed files with 213 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
workflow/engine/templates/cases/casesList.js
View File

@@ -984,7 +984,7 @@ Ext.onReady ( function() {
var processStore = new Ext.data.Store( {
proxy : new Ext.data.HttpProxy( {
url : 'casesList_Ajax?actionAjax=processListExtJs',
url : 'casesList_Ajax?actionAjax=processListExtJs&action='+action,
method : 'POST'
}),
reader : new Ext.data.JsonReader( {
@@ -1613,6 +1613,7 @@ Ext.onReady ( function() {
var rowSelectedJsonArray = rowAllJsonArray[rowSelectedIndex];
var TAS_UID = rowSelectedJsonArray.TAS_UID;
var PRO_UID = rowSelectedJsonArray.PRO_UID;
var USR_UID = rowSelectedJsonArray.USR_UID;
var APP_UID = rowSelectedJsonArray.APP_UID;
@@ -1620,7 +1621,31 @@ Ext.onReady ( function() {
optionMenuReassignGlobal.APP_UID = APP_UID;
optionMenuReassignGlobal.DEL_INDEX = DEL_INDEX;
if( rowSelected ){
//Check if the user is a supervisor to this Process
var reassigncase = false;
if(varReassignCase == 'true'){
reassigncase = true;
} else if (varReassignCaseSupervisor == 'true') {
aProcessList= JSON.parse(data.processeslist);
for(var i=0; i < aProcessList.length; ++i) {
if(aProcessList[i] == PRO_UID){
reassigncase = true;
}
}
}
if(!reassigncase) {
Ext.Msg.show({
title: _('ID_WARNING'),
msg: data.message,
animEl: 'elId',
icon: Ext.MessageBox.WARNING,
buttons: Ext.MessageBox.OK,
fn : function(btn) {
}
});
} else if( rowSelected ){
//Variables
var pageSizeUsersToReassign = 10;
@@ -1832,15 +1857,17 @@ Ext.onReady ( function() {
case 'todo':
menuItems = [optionMenuPause, optionMenuSummary, optionMenuNotes];
if( ___p34315105.search('R') != -1 )
if( varReassignCase == 'true' || varReassignCaseSupervisor == 'true'){
menuItems.push(optionMenuReassign);
}
break;
case 'draft':
menuItems = [optionMenuPause, optionMenuSummary, optionMenuNotes];
if( ___p34315105.search('R') != -1 )
if( varReassignCase == 'true' || varReassignCaseSupervisor == 'true'){
menuItems.push(optionMenuReassign);
}
menuItems.push(optionMenuDelete);
break;