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

Merged in bugfix/HOR-3618 (pull request #5859)

Browse Source 
HOR-3618

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Paula Quispe
2017-08-04 21:46:27 +00:00
parent 6fbefec225 d008d29e20
commit 201de5f91d
4 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/methods/cases/cases_SchedulerValidateUser.php
View File

@@ -50,9 +50,6 @@ $params = array ('userid' => $user,'password' => $pass);
$result = $client->__SoapCall( 'login', array ($params) ); $result = $client->__SoapCall( 'login', array ($params) );
if ($result->status_code == 0) { if ($result->status_code == 0) {
if (! class_exists( 'Users' )) {
require ("classes/model/UsersPeer.php");
}
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( 'USR_UID' ); $oCriteria->addSelectColumn( 'USR_UID' );
$oCriteria->add( UsersPeer::USR_USERNAME, $sWS_USER ); $oCriteria->add( UsersPeer::USR_USERNAME, $sWS_USER );

1
workflow/engine/methods/setup/appCacheViewAjax.php
View File

@@ -1,5 +1,4 @@
<?php <?php
require_once('classes/model/AppCacheView.php');
$filter = new InputFilter(); $filter = new InputFilter();
$_POST = $filter->xssFilterHard($_POST); $_POST = $filter->xssFilterHard($_POST);

3
workflow/engine/methods/setup/language_Ajax.php
View File

@@ -34,7 +34,6 @@ try {
$_POST['function'] = $filter->xssFilterHard($_POST['function']); $_POST['function'] = $filter->xssFilterHard($_POST['function']);
switch ($_POST['function']) { switch ($_POST['function']) {
case 'savePredetermined': case 'savePredetermined':
require_once "classes/model/Translation.php";
$tranlationsList = Translation::getTranslationEnvironments(); $tranlationsList = Translation::getTranslationEnvironments();
g::pr( $tranlationsList ); g::pr( $tranlationsList );
die(); die();
@@ -46,7 +45,7 @@ try {
break; break;
case 'languagesList': case 'languagesList':
$isoCountry = new isoCountry(); $isoCountry = new IsoCountry();
$translationRow = new Translation(); $translationRow = new Translation();
$response = new stdClass(); $response = new stdClass();
$translationsEnvList = $translationRow->getTranslationEnvironments(); $translationsEnvList = $translationRow->getTranslationEnvironments();

9
workflow/engine/methods/tools/ajaxListener.php
View File

@@ -27,9 +27,6 @@
* @author Erik Amaru Ortiz <erik@colosa.com> * @author Erik Amaru Ortiz <erik@colosa.com>
* @date Jan 10th, 2010 * @date Jan 10th, 2010
*/ */
if (! class_exists( 'Translation' )) {
require "classes/model/Translation.php";
}
$action = $_REQUEST['action']; $action = $_REQUEST['action'];
unset($_REQUEST['action']); unset($_REQUEST['action']);
@@ -45,12 +42,6 @@ class Ajax
$params['dateFrom'] = str_replace('T00:00:00', '', $params['dateFrom']); $params['dateFrom'] = str_replace('T00:00:00', '', $params['dateFrom']);
$params['dateTo'] = str_replace('T00:00:00', '', $params['dateTo']); $params['dateTo'] = str_replace('T00:00:00', '', $params['dateTo']);
$result = Translation::getAll('en', $params['start'], $params['limit'], $search, $params['dateFrom'], $params['dateTo']); $result = Translation::getAll('en', $params['start'], $params['limit'], $search, $params['dateFrom'], $params['dateTo']);
//$result = Translation::getAll('en', $params['start'], $params['limit'], $search);
/* foreach($result->data as $i=>$row){
$result->data[$i]['TRN_VALUE'] = substr($row['TRN_VALUE'], 0, 15) . '...';
} */
echo G::json_encode($result); echo G::json_encode($result);
} }