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

Merged in feature/HOR-4480 (pull request #6474)

Browse Source 
HOR-4480

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Roly
2018-06-04 18:13:52 +00:00
committed by Paula Quispe
parent dff09d5e3e fefe8d4f85
commit cb2e85a77e
25 changed files with 1791 additions and 667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/methods/services/ActionsByEmail.php
View File

@@ -1,6 +1,8 @@
<?php
/*----------------------------------********---------------------------------*/
use ProcessMaker\ChangeLog\ChangeLog;
if (isset($_GET['BROWSER_TIME_ZONE_OFFSET'])) {
if (PMLicensedFeatures::getSingleton()->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) {
// since all the request parameters using this script are encrypted
@@ -61,6 +63,13 @@ if (isset($_GET['BROWSER_TIME_ZONE_OFFSET'])) {
throw $e;
}
ChangeLog::getChangeLog()
->setSourceId(ChangeLog::FromABE);
$caseFieldsABE['CURRENT_DYNAFORM'] = '';
$caseFieldsABE['USER_UID'] = $caseFieldsABE['CURRENT_USER_UID'];
$caseFieldsABE['OBJECT_TYPE'] = '';
$case->updateCase($_REQUEST['APP_UID'], $caseFieldsABE);
$ws = new WsBase();

2
workflow/engine/methods/services/ActionsByEmailDataForm.php
View File

@@ -44,7 +44,7 @@ if (isset($_GET['BROWSER_TIME_ZONE_OFFSET'])) {
$configuration = $result->getRow();
$action = 'ActionsByEmailDataFormPost.php?APP_UID=' . $_REQUEST['APP_UID'] . '&DEL_INDEX=' .
$_REQUEST['DEL_INDEX'] . '&ABER=' . $_REQUEST['ABER'];
$_REQUEST['DEL_INDEX'] . '&ABER=' . $_REQUEST['ABER'] . '&DYN_UID=' . $_REQUEST['DYN_UID'];
$record = [];
$record['DYN_CONTENT'] = $configuration['DYN_CONTENT'];

17
workflow/engine/methods/services/ActionsByEmailDataFormPost.php
View File

@@ -1,7 +1,8 @@
<?php
if (PMLicensedFeatures
::getSingleton()
use ProcessMaker\ChangeLog\ChangeLog;
if (PMLicensedFeatures::getSingleton()
->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) {
$G_PUBLISH = new Publisher();
try {
@@ -29,6 +30,7 @@ if (PMLicensedFeatures
$appUid = G::decrypt($_GET['APP_UID'], URL_KEY);
$delIndex = G::decrypt($_REQUEST['DEL_INDEX'], URL_KEY);
$aber = G::decrypt($_REQUEST['ABER'], URL_KEY);
$dynUid = G::decrypt($_REQUEST['DYN_UID'], URL_KEY);
$forms = isset($_REQUEST['form']) ? $_REQUEST['form'] : [];
//Load data related to the case
@@ -50,15 +52,18 @@ if (PMLicensedFeatures
$_SESSION[$index] = $value;
}
$casesFields['CURRENT_DYNAFORM'] = $dynUid;
$casesFields['USER_UID'] = $casesFields['CURRENT_USER_UID'];
ChangeLog::getChangeLog()
->setSourceId(ChangeLog::FromABE);
//Update case info
$case->updateCase($appUid, $casesFields);
$wsBaseInstance = new WsBase();
$result = $wsBaseInstance->derivateCase(
$casesFields['CURRENT_USER_UID'],
$appUid,
$delIndex,
true
$casesFields['CURRENT_USER_UID'], $appUid, $delIndex, true
);
$code = (is_array($result) ? $result['status_code'] : $result->status_code);