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

Merged in feature/PMCORE-3834 (pull request #8566)

Browse Source 
Merging feature/PMCORE-3834 to develop
This commit is contained in:
Julio Cesar Laura Avendaño
2022-09-13 15:13:25 +00:00
parent 82258d3e85 cffc4d57db
commit ea7ca8fb67
1231 changed files with 6402 additions and 200710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/methods/authSources/authSourcesSynchronizeAjax.php
View File

@@ -34,7 +34,6 @@ class treeNode extends stdclass
}
try {
$json = new Services_JSON();
header("Content-Type: application/json;");
switch ($_REQUEST["m"]) {
@@ -51,7 +50,7 @@ try {
$departments = $ldapAdvanced->searchDepartments();
$terminatedOu = $ldapAdvanced->getTerminatedOu();
$nodes = lookForChildrenDeps("");
die($json->encode($nodes));
die(json_encode($nodes));
break;
case "saveDepartments":
$depsToCheck = ($_REQUEST['departmentsDN'] != '') ? explode('|', $_REQUEST['departmentsDN']) : [];
@@ -87,7 +86,7 @@ try {
[$parentDn, $departmentTitle]
);
echo $json->encode($response);
echo json_encode($response);
exit(0);
}
}
@@ -106,7 +105,7 @@ try {
$response->status = 'ERROR';
$response->message = G::LoadTranslation('ID_DEPARTMENT_ERROR_CREATE');
echo $json->encode($response);
echo json_encode($response);
exit(0);
}
}
@@ -144,7 +143,7 @@ try {
$response = new stdclass();
$response->status = "OK";
die($json->encode($response));
die(json_encode($response));
break;
case "loadGroups":
global $ldapAdvanced;
@@ -153,7 +152,7 @@ try {
$ldapAdvanced = getLDAPAdvanceInstance($_REQUEST["authUid"]);
$groups = $ldapAdvanced->searchGroups();
$nodes = lookForChildrenGroups();
die($json->encode($nodes));
die(json_encode($nodes));
break;
case "saveGroups":
$groupsToCheck = explode("|", $_REQUEST["groupsDN"]);
@@ -216,7 +215,7 @@ try {
if ($ldapAdvanced->checkDuplicateTitles()) {
$response->warning = G::LoadTranslation("ID_IT_WAS_IDENTIFIED_DUPLICATED_GROUPS_PLEASE_REMOVE_THESE_GROUPS");
}
die($json->encode($response));
die(json_encode($response));
break;
}
} catch (Exception $error) {
@@ -224,7 +223,7 @@ try {
$response->status = "ERROR";
$response->message = $error->getMessage();
die($json->encode($response));
die(json_encode($response));
}
function getLDAPAdvanceInstance($authUid)

26
workflow/engine/methods/cases/casesListSetup.php
View File

@@ -1,5 +1,5 @@
<?php
use Eusebiu\JavaScript\Facades\ScriptVariables;
use Illuminate\Support\Facades\View;
use ProcessMaker\Core\System;
use ProcessMaker\Model\User;
@@ -24,15 +24,17 @@ $oHeadPublisher->assignNumber("pageSize", 20); //sending the page size
$oHeadPublisher->assignNumber("availableFields", G::json_encode($availableFields));
$userCanAccess = 1;
$pmDynaform = new PmDynaform();
ScriptVariables::add('SYS_CREDENTIALS', base64_encode(G::json_encode($pmDynaform->getCredentials())));
ScriptVariables::add('SYS_SERVER_API', System::getHttpServerHostnameRequestsFrontEnd());
ScriptVariables::add('SYS_SERVER_AJAX', System::getServerProtocolHost());
ScriptVariables::add('SYS_WORKSPACE', config("system.workspace"));
ScriptVariables::add('SYS_URI', SYS_URI);
ScriptVariables::add('SYS_LANG', SYS_LANG);
ScriptVariables::add('TRANSLATIONS', $translation);
ScriptVariables::add('FORMATS', $conf->getFormats());
ScriptVariables::add('userId', User::getId($_SESSION['USER_LOGGED']));
echo View::make('Views::admin.settings.customCasesList', compact("userCanAccess"))->render();
$oHeadPublisher->assign('window.config', []);
$oHeadPublisher->assign('window.config.SYS_CREDENTIALS', base64_encode(G::json_encode($pmDynaform->getCredentials())));
$oHeadPublisher->assign('window.config.SYS_SERVER_API', System::getHttpServerHostnameRequestsFrontEnd());
$oHeadPublisher->assign('window.config.SYS_SERVER_AJAX', System::getServerProtocolHost());
$oHeadPublisher->assign('window.config.SYS_WORKSPACE', config('system.workspace'));
$oHeadPublisher->assign('window.config.SYS_URI', SYS_URI);
$oHeadPublisher->assign('window.config.SYS_LANG', SYS_LANG);
$oHeadPublisher->assign('window.config.TRANSLATIONS', $translation);
$oHeadPublisher->assign('window.config.FORMATS', $conf->getFormats());
$oHeadPublisher->assign('window.config.userId', User::getId($_SESSION['USER_LOGGED']));
echo View::make('Views::admin.settings.customCasesList', compact('userCanAccess', 'oHeadPublisher'))->render();

9
workflow/engine/methods/cases/cases_Step.php
View File

@@ -766,6 +766,7 @@ try {
//Take the first derivation rule as the task derivation rule type.
$aFields['PROCESS']['ROU_TYPE'] = $aFields['TASK'][1]['ROU_TYPE'];
$aFields['PROCESS']['ROU_FINISH_FLAG'] = false;
$aFields['PROCESS']['ERROR'] = '';
foreach ($aFields['TASK'] as $sKey => &$aValues) {
$sPriority = ''; //set priority value
@@ -780,6 +781,9 @@ try {
$hiddenName = "form[TASKS][" . $sKey . "][TAS_UID]";
$hiddenField = '<input type="hidden" name="' . $hiddenName . '" id="' . $hiddenName . '" value="' . $aValues['NEXT_TASK']['TAS_UID'] . '">';
$aFields['TASK'][$sKey]['NEXT_TASK']['TAS_HIDDEN_FIELD'] = $hiddenField;
$aFields['TASK'][$sKey]['NEXT_TASK']['USR_HIDDEN_FIELD'] = '';
$aFields['TASK'][$sKey]['NEXT_TASK']['ROU_FINISH_FLAG'] = $aFields['TASK'][$sKey]['NEXT_TASK']['ROU_FINISH_FLAG'] ?? false;
$aFields['TASK'][$sKey]['NEXT_TASK']['TAS_NEXT'] = $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_NEXT'] ?? '';
switch ($aValues['NEXT_TASK']['TAS_ASSIGN_TYPE']) {
case 'EVALUATE':
@@ -1008,6 +1012,8 @@ try {
$aFields['TASK'][$sKey]['NEXT_TASK']['SOURCE_UID'] = '<input type="hidden" name="' . $hiddenName . '[SOURCE_UID]" id="' . $hiddenName . '[SOURCE_UID]" value="' . $aValues['SOURCE_UID'] . '">';
}
}
$aFields['TASK'][$sKey]['NEXT_TASK']['ROU_PREVIOUS_TASK'] = $aFields['TASK'][$sKey]['NEXT_TASK']['ROU_PREVIOUS_TASK'] ?? '';
$aFields['TASK'][$sKey]['NEXT_TASK']['ROU_PREVIOUS_TYPE'] = $aFields['TASK'][$sKey]['NEXT_TASK']['ROU_PREVIOUS_TYPE'] ?? '';
}
$aFields['PROCESSING_MESSAGE'] = G::loadTranslation('ID_PROCESSING');
@@ -1069,6 +1075,9 @@ try {
}
}
if (!isset($aFields['PROCESS']['DISABLED'])) {
$aFields['PROCESS']['DISABLED'] = '';
}
$G_PUBLISH->AddContent('smarty', $tplFile, '', '', $aFields);
break;
case 'EXTERNAL':

57
workflow/engine/methods/cases/viena_init.php
View File

@@ -1,7 +1,5 @@
<?php
use Eusebiu\JavaScript\Facades\ScriptVariables;
use Illuminate\Support\Facades\View;
use ProcessMaker\Core\System;
use ProcessMaker\Model\Application;
use ProcessMaker\Model\Delegation;
@@ -9,8 +7,6 @@ use ProcessMaker\Model\User;
$conf = new Configurations();
$oHeadPublisher = headPublisher::getSingleton();
$keyMem = "USER_PREFERENCES" . $_SESSION["USER_LOGGED"];
$memcache = PMmemcached::getSingleton(config("system.workspace"));
@@ -125,40 +121,25 @@ if (isset($_SESSION['__OPEN_APPLICATION_UID__'])) {
}
}
$oServerConf = ServerConf::getSingleton();
if ($oServerConf->isRtl(SYS_LANG)) {
$regionTreePanel = 'east';
$regionDebug = 'west';
} else {
$regionTreePanel = 'west';
$regionDebug = 'east';
}
$urlProxy = 'casesMenuLoader?action=getAllCounters&r=';
$oHeadPublisher->assign('regionTreePanel', $regionTreePanel);
$oHeadPublisher->assign('regionDebug', $regionDebug);
$oHeadPublisher->assign('openCaseIE', $openCaseIE);
$oHeadPublisher->assign("defaultOption", $defaultOption); //User menu permissions
$oHeadPublisher->assign('urlProxy', $urlProxy); //sending the urlProxy to make
$oHeadPublisher->assign("_nodeId", isset($confDefaultOption) ? $confDefaultOption : "PM_USERS"); //User menu permissions
$oHeadPublisher->assign("FORMATS", $conf->getFormats());
$userCanAccess = 1;
global $translation;
$pmDynaform = new PmDynaform();
ScriptVariables::add('defaultOption', $defaultOption);
ScriptVariables::add('_nodeId', isset($confDefaultOption) ? $confDefaultOption : "PM_USERS");
ScriptVariables::add('SYS_CREDENTIALS', base64_encode(G::json_encode($pmDynaform->getCredentials())));
ScriptVariables::add('SYS_SERVER_API', System::getHttpServerHostnameRequestsFrontEnd());
ScriptVariables::add('SYS_SERVER_AJAX', System::getServerProtocolHost());
ScriptVariables::add('SYS_WORKSPACE', config("system.workspace"));
ScriptVariables::add('SYS_URI', SYS_URI);
ScriptVariables::add('SYS_LANG', SYS_LANG);
ScriptVariables::add('TRANSLATIONS', $translation);
ScriptVariables::add('FORMATS', $conf->getFormats());
ScriptVariables::add('userId', User::getId($_SESSION['USER_LOGGED']));
ScriptVariables::add('userConfig', array(
"usr_uid" => $_SESSION['USER_LOGGED']
));
G::RenderPage("publish", "viena");
$oHeadPublisher = headPublisher::getSingleton();
$oHeadPublisher->assign('window.config', []);
$oHeadPublisher->assign('window.config.defaultOption', $defaultOption);
$oHeadPublisher->assign('window.config._nodeId', isset($confDefaultOption) ? $confDefaultOption : 'PM_USERS');
$oHeadPublisher->assign('window.config.SYS_CREDENTIALS', base64_encode(G::json_encode($pmDynaform->getCredentials())));
$oHeadPublisher->assign('window.config.SYS_SERVER_API', System::getHttpServerHostnameRequestsFrontEnd());
$oHeadPublisher->assign('window.config.SYS_SERVER_AJAX', System::getServerProtocolHost());
$oHeadPublisher->assign('window.config.SYS_WORKSPACE', config('system.workspace'));
$oHeadPublisher->assign('window.config.SYS_URI', SYS_URI);
$oHeadPublisher->assign('window.config.SYS_LANG', SYS_LANG);
$oHeadPublisher->assign('window.config.TRANSLATIONS', $translation);
$oHeadPublisher->assign('window.config.FORMATS', $conf->getFormats());
$oHeadPublisher->assign('window.config.userId', User::getId($_SESSION['USER_LOGGED']));
$oHeadPublisher->assign('window.config.userConfig', [
'usr_uid' => $_SESSION['USER_LOGGED']
]);
G::RenderPage('publish', 'viena');

3
workflow/engine/methods/dynaforms/dynaforms_Save_as.php
View File

@@ -99,7 +99,8 @@ try {
fclose( $templateHd1 );
}
$criteria = ProcessMap::getDynaformsCriteria($PRO_UID);
$processMap = new ProcessMap();
$criteria = $processMap->getDynaformsCriteria($PRO_UID);
//FROM
//WHERE
//QUERY

2
workflow/engine/methods/events/eventsEdit.php
View File

@@ -54,7 +54,7 @@ foreach ($aAux1 as $aAux2) {
}
}
$oProcessMap = new ProcessMap( new DBConnection() );
$oProcessMap = new ProcessMap();
$aTriggersList = $oProcessMap->getTriggers( $_SESSION['PROCESS'] );
$aTriggersFileds = array ();
$aTriggersFileds[] = array ('TRI_UID' => 'char','TRI_TITLE' => 'char');

2
workflow/engine/methods/events/eventsNew.php
View File

@@ -43,7 +43,7 @@ foreach ($aAux1 as $aAux2) {
}
}
$oProcessMap = new ProcessMap( new DBConnection() );
$oProcessMap = new ProcessMap();
$aTriggersList = $oProcessMap->getTriggers( $_GET['PRO_UID'] );
$aTriggersFileds = array();

4
workflow/engine/methods/processes/ajaxListener.php
View File

@@ -311,7 +311,7 @@ class Ajax
{
switch ($param['type']) {
case 'process':
$oProcessMap = new ProcessMap(new DBConnection());
$oProcessMap = new ProcessMap();
$process = $oProcessMap->editProcessNew($param['UID']);
$category = ProcessCategoryPeer::retrieveByPk($process['PRO_CATEGORY']);
$categoryName = is_object($category) ? $category->getCategoryName() : '';
@@ -447,7 +447,7 @@ class Ajax
public function getPMVariables($param)
{
$oProcessMap = new ProcessMap(new DBConnection());
$oProcessMap = new ProcessMap();
$response->rows = getDynaformsVars($param['PRO_UID']);
foreach ($response->rows as $i => $var) {
$response->rows[$i]['sName'] = "@@{$var['sName']}";

2
workflow/engine/methods/processes/processes_Ajax.php
View File

@@ -110,7 +110,7 @@ try {
$resultProcess = $infoProcess->getProcessRow($proUid);
}
$oProcessMap = new ProcessMap(new DBConnection());
$oProcessMap = new ProcessMap();
switch ($_REQUEST['action']) {
case 'load':

2
workflow/engine/methods/setup/environmentSettingsAjax.php
View File

@@ -50,7 +50,7 @@ switch ($request) {
if (isset($_POST["casesListDateFormat"])) {
$config['casesListDateFormat'] = $_POST["casesListDateFormat"];
}
if (isset($_POST["casesListDateFormat"])) {
if (isset($_POST["casesListRowNumber"])) {
$config['casesListRowNumber'] = intval( $_POST["casesListRowNumber"] );
}
if (isset($_POST["txtCasesRefreshTime"])) {

6
workflow/engine/methods/triggers/triggers_Save.php
View File

@@ -32,7 +32,7 @@ if (isset( $sfunction ) && $sfunction == 'lookforNameTrigger') {
try {
$oTrigger = new Triggers();
$oProcessMap = new ProcessMap( new DBConnection() );
$oProcessMap = new ProcessMap();
if (isset( $_POST['form'] )) {
$value = $_POST['form'];
} else {
@@ -84,10 +84,6 @@ if (isset( $sfunction ) && $sfunction == 'lookforNameTrigger') {
G::auditLog("UpdateTrigger", $description);
}
//if (! isset( $_POST['mode'] )) {
// $oProcessMap->triggersList( $value['PRO_UID'] );
//}
$response["success"] = true;
$response["msg"] = G::LoadTranslation("ID_TRIGGERS_SAVED");
} catch (Exception $e) {

2
workflow/engine/methods/triggers/triggers_WizardSave.php
View File

@@ -8,7 +8,7 @@ if (!class_exists('Triggers')) {
}
$triggers = new Triggers();
$processMap = new ProcessMap(new DBConnection());
$processMap = new ProcessMap();
$post = $_POST;

2
workflow/engine/methods/triggers/triggers_WizardUpdate.php
View File

@@ -8,7 +8,7 @@ if (!class_exists('Triggers')) {
}
$triggers = new Triggers();
$processMap = new ProcessMap(new DBConnection());
$processMap = new ProcessMap();
$post = $_POST;