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

Merged in develop (pull request #5810)

Browse Source 
Develop

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Paula Quispe
2017-07-24 15:37:41 +00:00
parent 04c681a41c 03d72de184
commit 7e1170d411
7 changed files with 49 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gulliver/system/class.g.php
View File

@@ -2970,11 +2970,10 @@ class G
*/
public function is_utf8 ($string)
{
if (is_array( $string )) {
$enc = implode( '', $string );
return @! ((ord( $enc[0] ) != 239) && (ord( $enc[1] ) != 187) && (ord( $enc[2] ) != 191));
if (preg_match('//u', $string)) {
return true;
} else {
return (utf8_encode( utf8_decode( $string ) ) == $string);
return false;
}
}

2
workflow/engine/classes/class.pmLicenseManager.php
View File

@@ -67,7 +67,7 @@ class pmLicenseManager
$this->id = $results ['ID'];
$this->expireIn = $this->getExpireIn ();
$this->features = $this->result!='TMINUS'?isset($results ['DATA']['CUSTOMER_PLUGIN'])? $results ['DATA']['CUSTOMER_PLUGIN'] : $this->getActiveFeatures() : array();
$this->licensedfeatures = $this->result!='TMINUS'?isset($results ['DATA']['CUSTOMER_LICENSED_FEATURES'])? $results ['DATA']['CUSTOMER_LICENSED_FEATURES'] : array() : array();
$this->licensedfeatures = $this->result != 'TMINUS' ? (isset($results ['DATA']['CUSTOMER_LICENSED_FEATURES']) && is_array($results ['DATA']['CUSTOMER_LICENSED_FEATURES'])) ? $results ['DATA']['CUSTOMER_LICENSED_FEATURES'] : array() : array();
$this->licensedfeaturesList = isset($results ['DATA']['LICENSED_FEATURES_LIST'])? $results ['DATA']['LICENSED_FEATURES_LIST'] : null;
$this->status = $this->getCurrentLicenseStatus ();

2
workflow/engine/classes/class.wsBase.php
View File

@@ -1986,7 +1986,7 @@ class wsBase
$task = TaskPeer::retrieveByPK($taskId);
$arrayTaskTypeToExclude = array("START-TIMER-EVENT");
$arrayTaskTypeToExclude = array("START-TIMER-EVENT", "START-MESSAGE-EVENT");
if (!is_null($task) && !in_array($task->getTasType(), $arrayTaskTypeToExclude) && $founded == "") {
$result = new wsResponse( 14, G::LoadTranslation( 'ID_TASK_INVALID_USER_NOT_ASSIGNED_TASK' ) );

7
workflow/engine/controllers/pmTablesProxy.php
View File

@@ -506,7 +506,12 @@ class pmTablesProxy extends HttpProxyController
$j = 0;
foreach ($aAdditionalTables['FIELDS'] as $aField) {
$conData++;
$temp = (array_key_exists($j, $aAux))? '"' . addslashes(stripslashes(utf8_encode($aAux[$j]))) . '"' : '""';
if (array_key_exists($j, $aAux)) {
$temp = '"' . addslashes(stripslashes(G::is_utf8($aAux[$j]) ? $aAux[$j] : utf8_encode($aAux[$j]))) . '"';
} else {
$temp = '""';
}
if ($temp == '') {
switch ($aField['FLD_TYPE']) {

10
workflow/engine/methods/cases/open.php
View File

@@ -109,12 +109,14 @@ if( isset($_GET['action']) && ($_GET['action'] == 'jump') ) {
}
if(isset($_GET['actionFromList']) && ($_GET['actionFromList'] === 'to_revise') ){
$oApp = new Application;
$oApp->Load($appUid);
//If the case is completed can not update the information from supervisor/review
if($oApp->getAppStatus() === 'COMPLETED') {
$oSupervisor = new \ProcessMaker\BusinessModel\ProcessSupervisor();
$caseCanBeReview = $oSupervisor->reviewCaseStatusForSupervisor($appUid, $delIndex);
//Check if the case has the correct status for update the information from supervisor/review
if (!$caseCanBeReview) {
//The supervisor can not edit the information
$script = 'cases_Open?';
} else {
//The supervisor can edit the information, the case are in TO_DO
$script = 'cases_OpenToRevise?APP_UID=' . $appUid . '&DEL_INDEX=' . $delIndex . '&TAS_UID=' . $tasUid;
$oHeadPublisher->assign( 'treeToReviseTitle', G::loadtranslation( 'ID_STEP_LIST' ) );
$casesPanelUrl = 'casesToReviseTreeContent?APP_UID=' . $appUid . '&DEL_INDEX=' . $delIndex;

32
workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php
View File

@@ -1494,4 +1494,36 @@ class ProcessSupervisor
}
return false;
}
/**
* This function define if the supervisor can be review and edit
* The appStatus can be:TO_DO, DRAFT, COMPLETED, CANCELLED
* The thread status can be: PAUSED
* @param string $appUid
* @param integer $delIndex
* @return array
*/
public function reviewCaseStatusForSupervisor($appUid, $delIndex = 0)
{
$oApp = new \Application();
$oApp->Load($appUid);
$canEdit = false;
switch ($oApp->getAppStatus()) {
case 'TO_DO':
//Verify if the case is paused because the supervisor can not edit the PAUSED case
$oDelay = new \AppDelay();
if ($oDelay->isPaused($appUid, $delIndex)) {
$canEdit = false;
} else {
$canEdit = true;
}
break;
case 'COMPLETED':
case 'CANCELLED':
default:
$canEdit = false;
}
return $canEdit;
}
}

12
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -844,18 +844,6 @@ class BpmnWorkflow extends Project\Bpmn
"TAS_POSY" => $taskPosY
));
if ($elementType == "bpmnEvent" &&
in_array($key, array("end-message-event", "start-message-event", "intermediate-catch-message-event"))
) {
if (in_array($key, array("start-message-event", "intermediate-catch-message-event"))) {
//Task - User
//Assign to admin
$task = new \Tasks();
$result = $task->assignUser($taskUid, "00000000000000000000000000000001", 1);
}
}
//Element-Task-Relation - Create
$elementTaskRelation = new \ProcessMaker\BusinessModel\ElementTaskRelation();