diff --git a/workflow/engine/methods/setup/cron.php b/workflow/engine/methods/setup/cron.php
index 9df8e9237..78c04dd27 100644
--- a/workflow/engine/methods/setup/cron.php
+++ b/workflow/engine/methods/setup/cron.php
@@ -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" );
diff --git a/workflow/engine/methods/setup/cronAjax.php b/workflow/engine/methods/setup/cronAjax.php
index 26ba150cf..ea67d253d 100644
--- a/workflow/engine/methods/setup/cronAjax.php
+++ b/workflow/engine/methods/setup/cronAjax.php
@@ -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"];
diff --git a/workflow/engine/templates/setup/cron.js b/workflow/engine/templates/setup/cron.js
index 58598c93e..643918d51 100644
--- a/workflow/engine/templates/setup/cron.js
+++ b/workflow/engine/templates/setup/cron.js
@@ -63,7 +63,6 @@ cron.application = {
if (typeof record != "undefined") {
var strData = "" + _("ID_DATE_LABEL") + "
" + record.get("DATE") + "
";
- strData = strData + "" + _("ID_WORKSPACE") + "
" + record.get("WORKSPACE") + "
";
strData = strData + "" + _("ID_ACTION") + "
" + record.get("ACTION") + "
";
strData = strData + "" + _("ID_STATUS") + "
" + record.get("STATUS") + "
";
strData = strData + "" + _("ID_DESCRIPTION") + "
" + record.get("DESCRIPTION") + "
";
@@ -97,7 +96,6 @@ cron.application = {
totalProperty: "resultTotal",
fields: [
{name: "DATE"},
- {name: "WORKSPACE"},
{name: "ACTION"},
{name: "STATUS"},
{name: "DESCRIPTION"}
@@ -114,7 +112,6 @@ cron.application = {
this.baseParams = {
"option": "LST",
"pageSize": pageSize,
- "workspace": Ext.getCmp("cboWorkspace").getValue(),
"status": Ext.getCmp("cboStatus").getValue(),
"dateFrom": Ext.getCmp("dateFrom").getValue(),
"dateTo": Ext.getCmp("dateTo").getValue()
@@ -129,12 +126,6 @@ cron.application = {
}
});
- var storeWorkspace = new Ext.data.ArrayStore({
- idIndex: 0,
- fields: ["id", "value"],
- data: WORKSPACE
- });
-
var storeStatus = new Ext.data.ArrayStore({
idIndex: 0,
fields: ["id", "value"],
@@ -166,28 +157,6 @@ cron.application = {
value: ""
});
- var cboWorkspace = new Ext.form.ComboBox({
- id: "cboWorkspace",
-
- valueField: "id",
- displayField: "value",
- value: "ALL",
- store: storeWorkspace,
-
- triggerAction: "all",
- mode: "local",
- editable: false,
-
- width: 150,
-
- listeners: {
- select: function (combo, record, index)
- {
- pagingCron.moveFirst();
- }
- }
- });
-
var cboStatus = new Ext.form.ComboBox({
id: "cboStatus",
@@ -300,7 +269,6 @@ cron.application = {
expander,
{id: "ID", dataIndex: "DATE", hidden: true, hideable: false},
{header: _("ID_DATE_LABEL"), dataIndex: "DATE", width: 10, align: "center"},
- {header: _("ID_WORKSPACE"), dataIndex: "WORKSPACE", width: 10},
{header: _("ID_ACTION"), dataIndex: "ACTION", width: 10},
{header: _("ID_STATUS"), dataIndex: "STATUS", width: 7, align: "center"},
{header: _("ID_DESCRIPTION"), dataIndex: "DESCRIPTION"}
@@ -399,8 +367,6 @@ cron.application = {
//"-",
//btnView,
"->",
- {xtype: "tbtext", text: _("ID_WORKSPACE") + " "},
- cboWorkspace,
"-",
{xtype: "tbtext", text: _("ID_STATUS") + " "},
cboStatus,