fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in develop (pull request #6823)

Browse Source 
Updating branch with last changes in develop

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Julio Cesar Laura Avendaño
2019-03-27 15:29:16 +00:00
parent 6feb542ca2 1c9537e6c7
commit 3820556e67
2 changed files with 31 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
workflow/engine/classes/Cases.php
View File

@@ -818,7 +818,6 @@ class Cases
*
* @param string $appUid
* @param array $Fields
* @param bool $forceLoadData
*
* @return Fields
* @throws Exception
@@ -870,7 +869,7 @@ class Cases
* @see \ProcessMaker\BusinessModel\Cases\Variable::delete()
* @see \ProcessMaker\BusinessModel\Cases\Variable::update()
*/
public function updateCase($appUid, $Fields = [], $forceLoadData = false)
public function updateCase($appUid, $Fields = [])
{
try {
$application = new Application;
@@ -895,15 +894,10 @@ class Cases
}
//Get the appTitle and appDescription
$fieldsCase = [];
if ($forceLoadData) {
$lastFieldsCase = $this->loadCase($appUid)['APP_DATA'];
$fieldsCase = array_merge($appData, $lastFieldsCase);
}
$newTitleOrDescription = $this->newRefreshCaseTitleAndDescription(
$appUid,
$appFields,
empty($fieldsCase) ? $appData : $fieldsCase
$appData
);
//Start: Save History --By JHL
@@ -3510,6 +3504,7 @@ class Cases
$foundDisabledCode = "";
/*----------------------------------********---------------------------------*/
$varInAfterRouting = false;
$fieldsTrigger = [];
foreach ($triggersList as $trigger) {
/*----------------------------------********---------------------------------*/
@@ -3537,6 +3532,7 @@ class Cases
$executedOn = $oPMScript->getExecutionOriginForAStep($stepType, $stepUidObj, $triggerType);
$oPMScript->setExecutedOn($executedOn);
$oPMScript->execute();
//Return all the appData + variables changed in the execution
$appDataAfterTrigger = $oPMScript->aFields;
/**
@@ -3556,12 +3552,9 @@ class Cases
$fieldsCase = array_merge($fieldsCase, $lastFieldsCase);
}
//Update the case with the fields changed in the trigger
if (!empty($fieldsTrigger)) {
$appFieldsTrigger = [];
$appFieldsTrigger['APP_DATA'] = $fieldsTrigger;
//Update the case
$this->updateCase($appUid, $appFieldsTrigger, true);
//Save the fields changed in the trigger
if (!$varInAfterRouting && !empty($fieldsTrigger)) {
$varInAfterRouting = true;
}
//Merge the appData with variables changed
@@ -3578,6 +3571,17 @@ class Cases
}
}
/**
* Get the caseTitle from the nextTask and update the caseTitle
*/
if ($varInAfterRouting) {
$this->newRefreshCaseTitleAndDescription(
$appUid,
['DEL_INDEX' => 0],
$fieldsCase
);
}
/*----------------------------------********---------------------------------*/
if (!empty($foundDisabledCode)) {
G::SendTemporalMessage(

39
workflow/engine/menus/caseOptions.php
View File

@@ -1,26 +1,12 @@
<?php
/**
* caseOptions.php
CaseOptions define the menus that will show when a case is open
*
* ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2008 Colosa Inc.23
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
* @see Ajax::getCaseMenu()
* @see cases/cases_CatchSelfService.php
* @see cases/Cases_Resume.php
*
* @link https://wiki.processmaker.com/3.2/Cases/Running_Cases
*/
global $G_TMP_MENU;
global $sStatus;
@@ -73,16 +59,17 @@ switch ($_SESSION['actionCaseOptions']) {
unset($_SESSION['actionCaseOptions']);
if ((($sStatus === 'DRAFT') || ($sStatus === 'TO_DO')) && !$statusSendAndUnassigned) {
if (isset($_SESSION['bNoShowSteps'])) {
unset($_SESSION['bNoShowSteps']);
} else {
if ($viewSteps === true) {
$G_TMP_MENU->AddIdOption('STEPS', G::LoadTranslation('ID_STEPS'), 'javascript:showSteps();', 'absolute');
}
$G_TMP_MENU->AddIdOption('INFO', G::LoadTranslation('ID_INFORMATION'), 'javascript:showInformation();', 'absolute');
//Menu: Steps
if ($viewSteps === true) {
$G_TMP_MENU->AddIdOption('STEPS', G::LoadTranslation('ID_STEPS'), 'javascript:showSteps();', 'absolute');
}
//Menu: Information
$G_TMP_MENU->AddIdOption('INFO', G::LoadTranslation('ID_INFORMATION'), 'javascript:showInformation();', 'absolute');
//Menu: Actions
$G_TMP_MENU->AddIdOption('ACTIONS', G::LoadTranslation('ID_ACTIONS'), 'javascript:showActions();', 'absolute');
} else {
//Menu: Information
$G_TMP_MENU->AddIdOption('INFO', G::LoadTranslation('ID_INFORMATION'), 'javascript:showInformation();', 'absolute');
}
//Menu: Cases Notes
$G_TMP_MENU->AddIdOption('NOTES', G::LoadTranslation('ID_NOTES'), 'javascript:showNotes();', 'absolute');