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

Merge branch 'master' of bitbucket.org:colosa/processmaker into BUG-14958

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2014-09-25 17:21:29 -04:00
parent 7c69c4e93b efafb66371
commit 0261350ec0
6 changed files with 25 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
workflow/engine/methods/setup/cron.php
View File

@@ -73,16 +73,6 @@ foreach ($workspaces as $index => $workspace) {
sort( $arrayAux );
$arrayWorkspace = array ();
foreach ($arrayAux as $index => $value) {
$arrayWorkspace[] = array ($value,$value
);
}
array_unshift( $arrayWorkspace, array ("ALL",G::LoadTranslation( "ID_ALL_WORKSPACES" )
) );
//Status
$arrayStatus = array (array ("ALL",G::LoadTranslation( "ID_ALL" )
),array ("COMPLETED",G::LoadTranslation( "COMPLETED" )
@@ -95,7 +85,6 @@ $oHeadPublisher->addContent( "setup/cron" ); //Adding a html file .html
$oHeadPublisher->addExtJsScript( "setup/cron", false ); //Adding a javascript file .js
$oHeadPublisher->assign( "CONFIG", $config );
$oHeadPublisher->assign( "CRON", $cronInfo );
$oHeadPublisher->assign( "WORKSPACE", $arrayWorkspace );
$oHeadPublisher->assign( "STATUS", $arrayStatus );
G::RenderPage( "publish", "extJs" );

4
workflow/engine/methods/setup/cronAjax.php
View File

@@ -66,7 +66,7 @@ function cronArraySet ($str, $filter)
$arrayData = array ();
if ($sw == 1) {
$arrayData = array ("DATE" => $date,"WORKSPACE" => $workspace,"ACTION" => $action,"STATUS" => $status,"DESCRIPTION" => $description
$arrayData = array ("DATE" => $date, "ACTION" => $action, "STATUS" => $status, "DESCRIPTION" => $description
);
}
@@ -116,7 +116,7 @@ $response = array ();
switch ($option) {
case "LST":
$pageSize = $_REQUEST["pageSize"];
$workspace = $_REQUEST["workspace"];
$workspace = SYS_SYS;
$status = $_REQUEST["status"];
$dateFrom = $_REQUEST["dateFrom"];
$dateTo = $_REQUEST["dateTo"];