Merge branch '2.0' of git.colosa.net:processmaker into 2.0

workflow/engine/classes/class.processMap.php

@@ -3247,6 +3247,10 @@ class processMap {
             $sObject = G::LoadTranslation('ID_ALL');
           }
           break;
+        default :
+          $sObjectType = G::LoadTranslation('ID_ALL');
+          $sObject = G::LoadTranslation('ID_ALL');
+          break;
       }
       //Participated
       if ($aRow ['OP_PARTICIPATE'] == 0) {

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

@@ -2337,9 +2337,14 @@ processmap.prototype={
     /* Panel editor */
 
     this.panels.editor=new leimnud.module.panel();
+    oClientWinSize = getClientWindowSize();
+    var heightPanel = this.options.size.h;
+    if(heightPanel <= oClientWinSize.height ) heightPanel = heightPanel + 800;
+
     this.panels.editor.options={
       limit:true,
-      size:{w:this.options.size.w,h:this.options.size.h},
+//      size:{w:this.options.size.w,h:this.options.size.h},
+      size:{w:this.options.size.w,h:heightPanel},
       position:{x:200,y:0,centerX:true},
       title:"",
       titleBar:false,