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

Merged in release/3.3 (pull request #6664)

Browse Source 
HOR-4926

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2018-10-18 13:43:32 +00:00
committed by Julio Cesar Laura Avendaño
parent 4bede3daaf ba9b118740
commit 8e67cd72f1
10 changed files with 25 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/PmBootstrap.php
View File

@@ -1,5 +1,5 @@
<?php
//test
use ProcessMaker\Core\System;
class PmBootstrap extends Bootstrap
@@ -17,9 +17,7 @@ class PmBootstrap extends Bootstrap
require_once PATH_HOME . 'engine/config/paths.php';
//if (php_sapi_name() !== 'cli') {
session_start(); // starting session
//}
session_start(); // starting session
}
//wrapped

15
workflow/engine/classes/AppSolr.php
View File

@@ -2066,20 +2066,8 @@ class AppSolr
));
foreach ($indexes as $index) {
$unassignedUsersGroups = array();
// use cache
//$oMemcache = PMmemcached::getSingleton ($this->_solrInstance);
//$unassignedUsersGroups = $oMemcache->get ("SOLR_UNASSIGNED_USERS_GROUPS_" . $allAppDbData [$index] ['PRO_UID'] . "_" . $allAppDbData [$index] ['TAS_UID']);
//if (! $unassignedUsersGroups) {
$unassignedUsersGroups = $this->getTaskUnassignedUsersGroupsData($allAppDbData [$index] ['PRO_UID'], $allAppDbData [$index] ['TAS_UID']);
// if the task has unassigned users or groups add del_index of delegation
//foreach ($unassignedUsersGroups as $i => $newRow) {
// $unassignedUsersGroups [$i] ['DEL_INDEX'] = $allAppDbData [$index] ['DEL_INDEX'];
//}
// store in cache
//$oMemcache->set ("SOLR_UNASSIGNED_USERS_GROUPS_" . $allAppDbData [$index] ['PRO_UID'] . "_" . $allAppDbData [$index] ['TAS_UID'], $unassignedUsersGroups);
//}
// copy list of unassigned users and groups
foreach ($unassignedUsersGroups as $unassignedUserGroup) {
//unassigned users
@@ -2107,9 +2095,6 @@ class AppSolr
$dynaformFieldTypes = array();
// get cache instance
//$oMemcache = PMmemcached::getSingleton ($this->_solrInstance);
//$dynaformFieldTypes = $oMemcache->get ("SOLR_DYNAFORM_FIELD_TYPES_" . $documentInformation ['PRO_UID']);
//if (! $dynaformFieldTypes) {
$dynaformFileNames = $this->getProcessDynaformFileNames($documentInformation ['PRO_UID']);
$dynaformFields = array();
foreach ($dynaformFileNames as $dynaformFileName) {

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

@@ -4629,10 +4629,16 @@ class Cases
}
/**
* get all upload document that they have send it
* Get all upload document that they have send it
* @todo we need to improve the code in this function
*
* @name getAllUploadedDocumentsCriteria
* @param string $APP_UID
* @param string $sProcessUID
* @param string $sApplicationUID
* @param string $sTasKUID
* @param string $sUserUID
* @param integer $delIndex
*
* @return object
*/
public function getAllUploadedDocumentsCriteria($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID, $delIndex = 0)
@@ -4651,6 +4657,11 @@ class Cases
}
$aObjectPermissions = $this->getAllObjects($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID, $delIndex);
//The logic of the code that continues is based on the fact that INPUT_DOCUMENTS contains the uid of ATTACHMENTS
$aObjectPermissions['INPUT_DOCUMENTS'] = array_merge(
$aObjectPermissions['INPUT_DOCUMENTS'],
$aObjectPermissions['ATTACHMENTS']
);
if (!is_array($aObjectPermissions)) {
$aObjectPermissions = array(
@@ -5811,11 +5822,15 @@ class Cases
);
//Summary form it means does not show in the list
$resultObjects['SUMMARY_FORM'] = isset($mainObjects['VIEW']['SUMMARY_FORM']) ? $mainObjects['VIEW']['SUMMARY_FORM'] : 0;
//Attachments BLOCK it means does not show in the list
$resultObjects['ATTACHMENTS'] = G::arrayDiff(
$mainObjects['VIEW']['ATTACHMENTS'], $mainObjects['BLOCK']['ATTACHMENTS']
);
array_push($resultObjects["DYNAFORMS"], -1, -2);
array_push($resultObjects['INPUT_DOCUMENTS'], -1);
array_push($resultObjects['OUTPUT_DOCUMENTS'], -1);
array_push($resultObjects['CASES_NOTES'], -1);
array_push($resultObjects['ATTACHMENTS'], -1);
return $resultObjects;
}

36
workflow/engine/classes/ProcessMap.php
View File

@@ -1,43 +1,7 @@
<?php
/**
* class.processMap.php
*
* @package workflow.engine.ProcessMaker
*
* ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2011 Colosa Inc.
*
* 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.
*/
use ProcessMaker\Plugins\PluginRegistry;
/**
*
* @package workflow.engine.ProcessMaker
*/
/**
* processMap - Process Map class
*
* @package workflow.engine.ProcessMaker
* @author Julio Cesar Laura Avendano
* @copyright 2007 COLOSA
*/
class ProcessMap
{
/*

40
workflow/engine/classes/model/Process.php
View File

@@ -1,45 +1,5 @@
<?php
/**
* Process.php
*
* @package workflow.engine.classes.model
*
* ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2011 Colosa Inc.
*
* 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.
*
*/
//require_once 'classes/model/om/BaseProcess.php';
//require_once 'classes/model/Content.php';
//require_once 'classes/model/ProcessCategory.php';
/**
* Skeleton subclass for representing a row from the 'PROCESS' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
* @package workflow.engine.classes.model
*/
class Process extends BaseProcess
{
/**

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

@@ -3,13 +3,6 @@
use ProcessMaker\Core\System;
use ProcessMaker\Plugins\PluginRegistry;
/**
* Main Controller for processMaker v2.1
* @date Jul 17, 2011
*
* @author Erik Amaru Ortiz <erik@colosa.com>
*/
class Main extends Controller
{
private $memcache;

22
workflow/engine/methods/cases/main_init.php
View File

@@ -1,26 +1,4 @@
<?php
/**
* main.php Cases List main processor
*
* 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.
*/
$conf = new Configurations();

22
workflow/engine/methods/processes/processesList.php
View File

@@ -1,26 +1,4 @@
<?php
/**
* processes_List.php
*
* ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2008 Colosa Inc.
*
* 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.
*/
require_once 'classes/model/Process.php';

9
workflow/engine/src/ProcessMaker/BusinessModel/Process.php
View File

@@ -2,9 +2,10 @@
namespace ProcessMaker\BusinessModel;
use G;
use Criteria;
use DynaformHandler;
use G;
use PMmemcached;
use ProcessPeer;
use ResultSet;
@@ -1221,7 +1222,7 @@ class Process
if (($proData = $memcache->get($memkey)) === false) {
$proData = $process->getAllProcesses($start, $limit, null, $arrayFilterData["processName"]);
$memcache->set($memkey, $proData, \PMmemcached::ONE_HOUR);
$memcache->set($memkey, $proData, PMmemcached::ONE_HOUR);
$memcacheUsed = "no";
}
} else {
@@ -1232,8 +1233,8 @@ class Process
if (($proData = $memcache->get($memkey)) === false || ($totalCount = $memcache->get($memkeyTotal)) === false) {
$proData = $process->getAllProcesses($start, $limit);
$totalCount = $process->getAllProcessesCount();
$memcache->set($memkey, $proData, \PMmemcached::ONE_HOUR);
$memcache->set($memkeyTotal, $totalCount, \PMmemcached::ONE_HOUR);
$memcache->set($memkey, $proData, PMmemcached::ONE_HOUR);
$memcache->set($memkeyTotal, $totalCount, PMmemcached::ONE_HOUR);
$memcacheUsed = "no";
}
}

23
workflow/public_html/bootstrap.php
View File

@@ -1,27 +1,4 @@
<?php
/**
* sysGeneric.php
*
* ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2008 Colosa Inc.
*
* 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.
*
*/
use ProcessMaker\Plugins\PluginRegistry;