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

Merge branch 'master' of github.com:colosa/processmaker

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2013-11-04 10:13:03 -04:00
parent 305d393411 6521c0dadb
commit 02865b8045
8 changed files with 62 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gulliver/system/class.g.php
View File

@@ -5222,6 +5222,14 @@ class G
return $path; return $path;
} }
public function isUserFunction($functionName) {
$allFunctions = get_defined_functions();
if (!isset($allFunctions['user'])) {
$allFunctions['user'] = array();
}
return in_array(strtolower($functionName), $allFunctions['user']);
}
} }
/** /**

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

@@ -412,6 +412,9 @@ class AdditionalTables extends BaseAdditionalTables
} }
$stringOr .= ');'; $stringOr .= ');';
eval($stringOr); eval($stringOr);
$oCriteriaCount = clone $oCriteria;
eval('$count = ' . $sClassPeerName . '::doCount($oCriteria);');
} }
if (isset($_POST['sort'])) { if (isset($_POST['sort'])) {

2
workflow/engine/controllers/pmTablesProxy.php
View File

@@ -422,7 +422,7 @@ class pmTablesProxy extends HttpProxyController
$table = $additionalTables->load( $httpData->id, true ); $table = $additionalTables->load( $httpData->id, true );
if ($filter != '') { if ($filter != '') {
$result = $additionalTables::getAllData( $httpData->id, $start, $limit, true, $filter); $result = $additionalTables->getAllData( $httpData->id, $start, $limit, true, $filter);
} else { } else {
$result = $additionalTables->getAllData( $httpData->id, $start, $limit ); $result = $additionalTables->getAllData( $httpData->id, $start, $limit );
} }

2
workflow/engine/methods/appFolder/appFolderAjax.php
View File

@@ -20,7 +20,7 @@ if (! isset ($_REQUEST ['action'])) {
print G::json_encode ($res); print G::json_encode ($res);
die (); die ();
} }
if (! function_exists ($_REQUEST ['action'])) { if (! function_exists ($_REQUEST['action']) || !G::isUserFunction($_REQUEST['action'])) {
$res ['success'] = false; $res ['success'] = false;
$res ['message'] = 'The requested action does not exist'; $res ['message'] = 'The requested action does not exist';
print G::json_encode ($res); print G::json_encode ($res);

2
workflow/engine/methods/cases/caseNotesAjax.php
View File

@@ -5,7 +5,7 @@ if (! isset( $_REQUEST['action'] )) {
print G::json_encode( $res ); print G::json_encode( $res );
die(); die();
} }
if (! function_exists( $_REQUEST['action'] )) { if (! function_exists( $_REQUEST['action'] ) || !G::isUserFunction($_REQUEST['action'])) {
$res['success'] = 'failure'; $res['success'] = 'failure';
$res['message'] = 'The requested action does not exist'; $res['message'] = 'The requested action does not exist';
header( "Content-Type: application/json" ); header( "Content-Type: application/json" );

2
workflow/engine/methods/cases/casesStartPage_Ajax.php
View File

@@ -13,7 +13,7 @@ if (! isset( $_REQUEST['action'] )) {
print G::json_encode( $res ); print G::json_encode( $res );
die(); die();
} }
if (! function_exists( $_REQUEST['action'] )) { if (! function_exists( $_REQUEST['action'] ) || !G::isUserFunction($_REQUEST['action'])) {
$res['success'] = 'failure'; $res['success'] = 'failure';
$res['message'] = G::LoadTranslation( 'ID_REQUEST_ACTION_NOT_EXIST' ); $res['message'] = G::LoadTranslation( 'ID_REQUEST_ACTION_NOT_EXIST' );
print G::json_encode( $res ); print G::json_encode( $res );

2
workflow/engine/methods/cases/cases_SchedulerGetPlugins.php
View File

@@ -6,7 +6,7 @@ if (! isset( $_REQUEST['action'] )) {
print G::json_encode( $return ); print G::json_encode( $return );
die(); die();
} }
if (! function_exists( $_REQUEST['action'] )) { if (! function_exists( $_REQUEST['action'] ) || !G::isUserFunction($_REQUEST['action'])) {
$return['success'] = 'failure'; $return['success'] = 'failure';
$return['message'] = 'The requested action doesn\'t exists'; $return['message'] = 'The requested action doesn\'t exists';
print G::json_encode( $return ); print G::json_encode( $return );

5
workflow/engine/templates/pmTables/data.js
View File

@@ -463,14 +463,15 @@ onMessageContextMenu = function (grid, rowIndex, e) {
/////JS FUNCTIONS /////JS FUNCTIONS
//Do Search Function //Do Search Function
DoSearch = function(){ DoSearch = function(){
infoGrid.store.load({params: {textFilter: searchText.getValue()}}); infoGrid.store.setBaseParam('textFilter', searchText.getValue());
infoGrid.store.load({params: {start : 0 , limit : pageSize }});
}; };
//Load Grid By Default //Load Grid By Default
GridByDefault = function(){ GridByDefault = function(){
searchText.reset(); searchText.reset();
infoGrid.store.setBaseParam('textFilter', searchText.getValue());
infoGrid.store.load(); infoGrid.store.load();
}; };