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

Merged in mcuiza/processmaker/PM-2007 (pull request #1831)

Browse Source 
PM-2007 - (New Designer) DESIGNER -> Report Tables El campo type aparentemente soporta grillas
This commit is contained in:
Julio Cesar Laura Avendaño
2015-03-31 13:53:27 -04:00
parent e15828958a 3fbbca2d45
commit 3f6f941a16
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/controllers/pmTables.php
View File

@@ -112,6 +112,12 @@ class pmTables extends Controller
$this->setJSVar( 'dataNumRows', $dataNumRows ); $this->setJSVar( 'dataNumRows', $dataNumRows );
$this->setJSVar( '_plugin_permissions', $repTabPluginPermissions ); $this->setJSVar( '_plugin_permissions', $repTabPluginPermissions );
$this->setJSVar( 'sizeTableName', $this->getSizeTableName()); $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' ); G::RenderPage( 'publish', 'extJs' );
} }

3
workflow/engine/templates/pmTables/editReport.js
View File

@@ -876,7 +876,8 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
} }
} }
}); });
comboReport.setReadOnly(isBpmn);
processStore = new Ext.data.Store( { processStore = new Ext.data.Store( {
autoLoad: true, autoLoad: true,