From 14b738f974d6e67625dcfa0f22de685b91f8f6e6 Mon Sep 17 00:00:00 2001
From: Alvaro Campos <alvaro@colosa.com>
Date: Tue, 5 Jun 2012 10:54:38 -0400
Subject: [PATCH] BUG 8942 Dialog box to edit conditions ... is too narrow 
 SOLVED

- This problem was resolved, at the same time was resolved a problem with the confirmation window.
---
 .../engine/js/processmap/core/processmap.js   | 24 ++++++++++---------
 .../patterns/patterns_ParallelJoin.xml        |  3 ++-
 .../xmlform/patterns/patterns_Sequential.xml  |  5 ++--
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/workflow/engine/js/processmap/core/processmap.js b/workflow/engine/js/processmap/core/processmap.js
index 6de3b2320..29424d147 100755
--- a/workflow/engine/js/processmap/core/processmap.js
+++ b/workflow/engine/js/processmap/core/processmap.js
@@ -917,16 +917,18 @@ var processmap=function(){
               this.observers.lineas.unregister(deri.to[i].object.indexObserver);
             }
             if(deri.type===5 || deri.type===8)
-            {
+            { 
               var toTask = this.data.db.task[this.tools.getIndexOfUid(deri.to[i].task)];
-              toTask.object.inJoin = toTask.object.inJoin-1;
-              if(toTask.object.inJoin===0)
-              {
-                this.parent.dom.setStyle(toTask.object.elements.init,{
-                  backgroundPosition:"0 0",
-                  background:""
-                });
-              }
+              if (typeof(toTask) != 'undefined') {
+                toTask.object.inJoin = toTask.object.inJoin-1;
+                if(toTask.object.inJoin===0)
+                {
+                  this.parent.dom.setStyle(toTask.object.elements.init,{
+                    backgroundPosition:"0 0",
+                    background:""
+                  });
+                }  
+              }              
             }
           }
         }
@@ -2207,7 +2209,7 @@ var processmap=function(){
           iHeight = 350;
         break;
         case 4:
-          iWidth  = 500;
+          iWidth  = 600;
           iHeight = 350;
         break;
         case 5:
@@ -2227,7 +2229,7 @@ var processmap=function(){
         position:{x:50,y:50,center:true},
         title :G_STRINGS.ID_PROCESSMAP_WORKFLOW_PATTERNS+": "+task.label,
         theme :this.options.theme,
-        control :{close:true,resize:false},
+        control :{close:true,resize:true},
         fx  :{modal:true}
       };
       panel.make();
diff --git a/workflow/engine/xmlform/patterns/patterns_ParallelJoin.xml b/workflow/engine/xmlform/patterns/patterns_ParallelJoin.xml
index 93112ce19..bf5bf5ba3 100755
--- a/workflow/engine/xmlform/patterns/patterns_ParallelJoin.xml
+++ b/workflow/engine/xmlform/patterns/patterns_ParallelJoin.xml
@@ -39,6 +39,7 @@ leimnud.event.add(getField('ROU_NEXT_TASK'),    'change', modified);
 //leimnud.event.add(getField('ROU_TO_LAST_USER'), 'change', modified);
 Pm.tmp.derivationsPanel.events.remove = function() {
   if (bModified) {
+  Pm.tmp.derivationsPanel.inRemove = false;
   Pm.tmp.derivationsPanel.cancelClose=true;
     new leimnud.module.app.confirm().make({
       label:  G_STRINGS.ID_SAVE_DERIVATION_RULES_BEFORE_CLOSING,
@@ -46,7 +47,7 @@ Pm.tmp.derivationsPanel.events.remove = function() {
         Pm.tmp.derivationsPanel.cancelClose=false;
         bModified = false;
         getField('SAVE').onclick();
-      }.extend(this),
+      },
       cancel: function() {
         Pm.tmp.derivationsPanel.cancelClose=false;
         bModified = false;
diff --git a/workflow/engine/xmlform/patterns/patterns_Sequential.xml b/workflow/engine/xmlform/patterns/patterns_Sequential.xml
index a9b086b83..079722d21 100755
--- a/workflow/engine/xmlform/patterns/patterns_Sequential.xml
+++ b/workflow/engine/xmlform/patterns/patterns_Sequential.xml
@@ -41,6 +41,7 @@ leimnud.event.add(getField('ROU_NEXT_TASK'),    'change', modified);
 //leimnud.event.add(getField('ROU_TO_LAST_USER'), 'change', modified);
 Pm.tmp.derivationsPanel.events.remove = function() {
   if (bModified) {
+    Pm.tmp.derivationsPanel.inRemove = false;
     Pm.tmp.derivationsPanel.cancelClose=true;
     new leimnud.module.app.confirm().make({
       label:  G_STRINGS.ID_SAVE_DERIVATION_RULES_BEFORE_CLOSING,
@@ -48,10 +49,10 @@ Pm.tmp.derivationsPanel.events.remove = function() {
         Pm.tmp.derivationsPanel.cancelClose=false;
         bModified = false;
         getField('SAVE').onclick();
-      }.extend(this),
+      },
       cancel: function() {
         Pm.tmp.derivationsPanel.cancelClose=false;
-        bModified = false;
+        bModified = false;    
         Pm.tmp.derivationsPanel.remove();
       }
     });