Merged master into dashboards2

2015-03-31 14:29:38 -04:00
parent c0867cfc35 ec1a31e6a6
commit 751c96f82f
7 changed files with 59 additions and 5 deletions
--- 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' );
    }