fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/feature/HOR-3559' into feature/HOR-3629

Browse Source
This commit is contained in:
Ronald Quenta
2017-08-10 21:23:02 -04:00
parent 917c94784b 97a01c4fa1
commit 7b3c5ee163
2 changed files with 27 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
gulliver/bin/gulliver.php
View File

@@ -1,66 +1,35 @@
<?php
/**
* gulliver.php
* @package gulliver.bin.tasks
*
* 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(__DIR__ . '/../../bootstrap/autoload.php');
if (! PATH_THIRDPARTY ) {
if (!PATH_THIRDPARTY) {
die("You must launch gulliver command line with the gulliver script\n");
}
}
// set magic_quotes_runtime to off
ini_set('magic_quotes_runtime', 'Off');
// set magic_quotes_runtime to off
ini_set('magic_quotes_runtime', 'Off');
/**
* require_once pakeFunction.php
*/
require_once( PATH_THIRDPARTY . 'pake' . PATH_SEP . 'pakeFunction.php');
require_once( PATH_THIRDPARTY . 'pake' . PATH_SEP . 'pakeGetopt.class.php');
require_once( PATH_CORE . 'config' . PATH_SEP . 'environments.php');
require_once(PATH_CORE . 'config' . PATH_SEP . 'environments.php');
// trap -V before pake
if (in_array('-V', $argv) || in_array('--version', $argv))
{
printf("Gulliver version %s\n", pakeColor::colorize(trim(file_get_contents( PATH_GULLIVER . 'VERSION')), 'INFO'));
// trap -V before pake
if (in_array('-V', $argv) || in_array('--version', $argv)) {
printf("Gulliver version %s\n", pakeColor::colorize(trim(file_get_contents(PATH_GULLIVER . 'VERSION')), 'INFO'));
exit(0);
}
}
if (count($argv) <= 1)
{
if (count($argv) <= 1) {
$argv[] = '-T';
}
}
// register tasks
$dir = PATH_GULLIVER_HOME . 'bin' . PATH_SEP . 'tasks';
$tasks = pakeFinder::type('file')->name('pake*.php')->in($dir);
// register tasks
$dir = PATH_GULLIVER_HOME . 'bin' . PATH_SEP . 'tasks';
$tasks = pakeFinder::type('file')->name( 'pake*.php' )->in($dir);
foreach ($tasks as $task) {
foreach ($tasks as $task) {
include_once($task);
}
}
// run task
pakeApp::get_instance()->run(null, null, false);
// run task
pakeApp::get_instance()->run(null, null, false);
exit(0);
exit(0);

3
workflow/engine/classes/model/ListParticipatedLast.php
View File

@@ -34,6 +34,7 @@ class ListParticipatedLast extends BaseListParticipatedLast
$aRow = $dataset->getRow();
$data['APP_STATUS'] = $aRow['APP_STATUS'];
$currentInformation = array();
if ($data['USR_UID'] != 'SELF_SERVICES') {
if ($data['USR_UID'] != '') {
$criteria = new Criteria();
@@ -90,7 +91,9 @@ class ListParticipatedLast extends BaseListParticipatedLast
$data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']];
}
//We will update the current information
if (count($currentInformation) > 0) {
$this->updateCurrentInfoByAppUid($data['APP_UID'], $currentInformation);
}
$con = Propel::getConnection(ListParticipatedLastPeer::DATABASE_NAME);
try {