Merged master into dashboards2

workflow/engine/classes/class.processMap.php

@@ -2640,7 +2640,7 @@ class processMap
                 }
                 
             } else {
-                throw new Exception(G::loadTranslation('ID_INVALID_ROU_TYPE_DEFINITION_ON_ROUTE_TABLE'));
+                throw new Exception(G::loadTranslation('ID_NO_DERIVATIONS_DEFINED'));
             }
 
             $aFields['action'] = 'savePattern';
@@ -2658,7 +2658,8 @@ class processMap
             $aMessage = array();
             $aMessage['MESSAGE'] = $oError->getMessage();
             $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage);
-            G::RenderPage('publish', 'blank');
+            G::RenderPage('publish', 'raw');
+            return true;
             die();
         }
     }

workflow/engine/controllers/pmTables.php

@@ -113,6 +113,12 @@ class pmTables extends Controller
         $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' );
     }
 

workflow/engine/js/processmap/core/processmap.js

@@ -2246,7 +2246,18 @@ var processmap=function(){
 
     if (event)
     {
-      if (typeof(this.data.db.task[index].derivation.type) == 'undefined')
+      if(typeof(this.data.db.task[index].derivation.type.length) == 'undefined')
+      {
+        var derivationFlag = '1';
+      } 
+      else
+      {
+        if(this.data.db.task[index].derivation.type.length == '0')
+        {
+          var derivationFlag = '0';
+        }  
+      }
+      if (typeof(this.data.db.task[index].derivation.type) == 'undefined' || derivationFlag == '0')
       {
         new leimnud.module.app.alert().make(
             {
@@ -2281,10 +2292,13 @@ var processmap=function(){
           iWidth  = 450;
           iHeight = 205;
         break;
-                                case 8:
+        case 8:
           iWidth  = 550;
           iHeight = 300;
         break;
+        default:
+          iWidth  = 400;
+          iHeight = 110;
       }
 
       this.tmp.derivationsPanel = panel =new leimnud.module.panel();

workflow/engine/methods/cases/casesMenuLoader.php

@@ -30,6 +30,15 @@ function getLoadTreeMenuData ()
     //'to_revise',
     //'to_reassign'
     $aTypesID = Array ('CASES_INBOX' => 'to_do','CASES_DRAFT' => 'draft','CASES_CANCELLED' => 'cancelled','CASES_SENT' => 'sent','CASES_PAUSED' => 'paused','CASES_COMPLETED' => 'completed','CASES_SELFSERVICE' => 'selfservice');
+
+    /*----------------------------------********---------------------------------*/
+    $licensedFeatures = & PMLicensedFeatures::getSingleton();
+    if ($licensedFeatures->verifyfeature('7TTeDBQeWRoZTZKYjh4eFpYUlRDUUEyVERPU3FxellWank=')) {
+        $aTypesID['CONSOLIDATED_CASES'] = 'batch_routing';
+        $aTypes[] = 'batch_routing';
+    }
+    /*----------------------------------********---------------------------------*/
+
     //'CASES_TO_REVISE'=>'to_revise',
     //'CASES_TO_REASSIGN'=>'to_reassign'
         $list = array ();

workflow/engine/src/ProcessMaker/BusinessModel/Lists.php

@@ -222,6 +222,20 @@ class Lists {
             array('count' => $totalUnassigned,                  'item' => 'CASES_SELFSERVICE')
         );
 
+        /*----------------------------------********---------------------------------*/
+        $licensedFeatures = & \PMLicensedFeatures::getSingleton();
+        if ($licensedFeatures->verifyfeature('7TTeDBQeWRoZTZKYjh4eFpYUlRDUUEyVERPU3FxellWank=')) {
+            $criteria = new Criteria();
+            $criteria->add(\CaseConsolidatedPeer::CON_STATUS, 'ACTIVE');
+            $criteria->addJoin(\CaseConsolidatedPeer::TAS_UID, \AppCacheViewPeer::TAS_UID, Criteria::LEFT_JOIN);
+            $criteria->add(\AppCacheViewPeer::USR_UID, $userId);
+            $criteria->add(\AppCacheViewPeer::DEL_THREAD_STATUS, 'OPEN');
+            $criteria->add(\AppCacheViewPeer::APP_STATUS, 'TO_DO');
+            $total = \CaseConsolidatedPeer::doCount( $criteria );
+            $response[] = array('count' => $total,            'item' => 'CONSOLIDATED_CASES');
+        }
+        /*----------------------------------********---------------------------------*/
+
         return $response;
     }
 }

workflow/engine/templates/pmTables/editReport.js

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

workflow/public_html/.htaccess

@@ -0,0 +1,9 @@
+<FilesMatch "\.(htaccess|php|ini|log|sh|inc|bak|config)$">
+        Order Allow,Deny
+        Deny from all
+</FilesMatch>
+
+<FilesMatch "^(app|sysGeneric)\.php$">
+        Order Allow,Deny 
+        Allow from All 
+</FilesMatch>