Merge remote branch 'upstream/master' into BUG-10852

workflow/engine/classes/class.pmScript.php

@@ -335,9 +335,12 @@ class PMScript
             for ($i = 0; $i < $iOcurrences; $i ++) {
                 // if the variables for that condition has not been previously defined then $variableIsDefined
                 // is set to false
-                if (! isset( $this->aFields[$aMatch[2][$i][0]] )) {
-                    // $variableIsDefined = false;
+                if (!isset($this->aFields[$aMatch[2][$i][0]]) && !isset($aMatch[5][$i][0])) {
                     $this->aFields[$aMatch[2][$i][0]] = '';
+                } else {
+                    if (!isset($this->aFields[$aMatch[2][$i][0]])) {
+                        eval("\$this->aFields['" . $aMatch[2][$i][0] . "']" . $aMatch[5][$i][0] . " = '';");
+                    }
                 }
                 $sAux = substr( $this->sScript, $iAux, $aMatch[0][$i][1] - $iAux );
                 if (! $bEqual) {

workflow/engine/templates/admin/pmLogo.html

@@ -72,7 +72,7 @@
     display      : inline;
     margin       : 4px;
     margin-right : 0;
-    padding      : 5px;
+    padding      : 22px;
     border       : 1px solid white;
   }
   #images-view .thumb-wrap span {
@@ -84,7 +84,7 @@
     border     : 1px solid #99bbe8;
     opacity    : 0.5;
     background : #efefef url(/images/ext/row-over.gif) repeat-x left top;
-    padding      : 5px;
+    padding      : 22px;
   }
 
 
@@ -92,7 +92,8 @@
     border     : 1px solid #99bbe8;
     background : #eff5fb url(/images/select-icon.png) no-repeat right bottom;
     opacity    : 0.5;
-    padding    : 5px;
+    padding    : 22px;
+    text-align : center;
   }
   #images-view .x-view-selected .thumb {
     background : transparent;

workflow/engine/templates/admin/pmLogo.js

@@ -182,6 +182,7 @@ Ext.onReady(function() {
     autoHeight  : false,
     height      : 800,
     multiSelect : true,
+    autoScroll: true,
     overClass   : 'x-view-over', 
     itemSelector: 'div.thumb-wrap',
     emptyText   : _('ID_NO_IMAGES_TO_DISPLAY'),

workflow/engine/templates/cases/open.js

@@ -121,7 +121,7 @@ Ext.onReady(function(){
               var actionMenu = Ext.getCmp('actionMenu');
               actionMenu.menu.removeAll();
               for(j=0; j<data[i].options.length; j++) {
-            	if(!data[i].options[j].hide){
+            	 if(!data[i].options[j].hide){
                   actionMenu.menu.add({
                     text: data[i].options[j].text,
                     handler: data[i].options[j].fn != '' ? Actions[data[i].options[j].fn] : function(){}
@@ -759,6 +759,7 @@ Ext.onReady(function(){
       autoScroll:true,
       modal: true,
       maximizable: false,
+      resizable: false,
       items: [frm]
     });
     win.show();