From 3fbbca2d45dd3069c997713dca5e8901fc7fc082 Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Mon, 30 Mar 2015 17:38:13 -0400 Subject: [PATCH] PM-2007 (New Designer) DESIGNER -> Report Tables El campo type aparentemente soporta grillas Se valido segun BPMN Y BPM --- workflow/engine/controllers/pmTables.php | 6 ++++++ workflow/engine/templates/pmTables/editReport.js | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/workflow/engine/controllers/pmTables.php b/workflow/engine/controllers/pmTables.php index 533ad8387..da96eab69 100755 --- a/workflow/engine/controllers/pmTables.php +++ b/workflow/engine/controllers/pmTables.php @@ -112,6 +112,12 @@ class pmTables extends Controller $this->setJSVar( 'dataNumRows', $dataNumRows ); $this->setJSVar( '_plugin_permissions', $repTabPluginPermissions ); $this->setJSVar( 'sizeTableName', $this->getSizeTableName()); + + require_once 'classes/model/AdditionalTables.php'; + $process = new Process(); + $isBpmn = $process->isBpmnProcess($_GET['PRO_UID']); + + $this->setJSVar( 'isBpmn', $isBpmn ); G::RenderPage( 'publish', 'extJs' ); } diff --git a/workflow/engine/templates/pmTables/editReport.js b/workflow/engine/templates/pmTables/editReport.js index 603960af0..9ebf235ec 100755 --- a/workflow/engine/templates/pmTables/editReport.js +++ b/workflow/engine/templates/pmTables/editReport.js @@ -876,7 +876,8 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) { } } }); - + + comboReport.setReadOnly(isBpmn); processStore = new Ext.data.Store( { autoLoad: true,