From bd748a805cc1dbd1d2645f24bb1fd29a371892ec Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Fri, 22 Feb 2013 15:55:26 -0400
Subject: [PATCH 1/2] BUG 10850 Cuando se borra una tarea de un proceso no se
 borra... SOLVED

- Derivation no were erased correctly.
- Was add validation in file processmap.
 with '#' will be ignored, and an empty message aborts the commit.
---
 .../engine/js/processmap/core/processmap.js   | 45 ++++++++++++++-----
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/workflow/engine/js/processmap/core/processmap.js b/workflow/engine/js/processmap/core/processmap.js
index a6e99e4f9..fb5a1f203 100755
--- a/workflow/engine/js/processmap/core/processmap.js
+++ b/workflow/engine/js/processmap/core/processmap.js
@@ -958,7 +958,9 @@ var processmap=function(){
         this.parent.dom.setStyle(task.object.elements.derivation,{
           background:""
         });
-        task.derivation={to:[]};
+        if (spec == false && typeof(rec) == 'undefined') {
+          task.derivation={to:[]};
+        }
 
         /* Delete derivation recursive */
         if(rec)
@@ -1556,6 +1558,24 @@ var processmap=function(){
                     this.dropables.derivation.unregister(data.object.dropIndex);
                     this.data.render.deleteDerivation(data.uid, true);
                     this.parent.dom.remove(data.object.elements);
+                    var taskUidDelete = this.data.db.task[data.object.dropIndex].uid;
+                    for (var i= 0; i<(this.data.db.task).length;i++) {
+                      for (var j= 0; j<(this.data.db.task[i]).length;j++) {
+                        this.data.db.task[i] = this.data.db.task[i+1];
+                      }
+                      var j = 0;
+                      var itemDelete = (this.data.db.task[i]).derivation;
+                      while (j < itemDelete.to.length) {
+                        if (itemDelete.to[j].task == taskUidDelete) {
+                          for (var k= j; k<itemDelete.to.length;k++) {
+                            itemDelete.to[k] = itemDelete.to[k+1];
+                          }
+                          (itemDelete.to).splice((itemDelete.to).length - 1,1);
+                        } else {
+                          j++;
+                        }
+                      }
+                    }
                     var r2 = new leimnud.module.rpc.xmlhttp({
                       url: this.options.dataServer,
                       args: "action=deleteTask&data=" + {
@@ -2199,7 +2219,6 @@ var processmap=function(){
     }
   }.expand(this,true);
   this.patternPanel=function(event,index,din){
-
     var options   = this.data.db.task[index];
     var db    = this.data.db, task=db.task[index];
     var derivation  = task.derivation.to;
@@ -2441,15 +2460,19 @@ processmap.prototype={
     /* Hidden processmaker menu-submenu END*/
     /* Change skin fro processmap BEGIN */
     if (this.options.rw === true) {
-      var bd = this.parent.dom.capture("tag.body 0");
-      var sm = this.parent.dom.element("pm_submenu");
-      this.parent.dom.setStyle(bd,{
-        backgroundColor:"buttonface"
-      });
-      this.parent.dom.setStyle(sm,{
-        //height:(sm.offsetHeight-21)
-        height:25
-      });
+      try {
+        var bd = this.parent.dom.capture("tag.body 0");
+        var sm = this.parent.dom.element("pm_submenu");
+        this.parent.dom.setStyle(bd,{
+          backgroundColor:"buttonface"
+        });
+        this.parent.dom.setStyle(sm,{
+          //height:(sm.offsetHeight-21)
+          height:25
+        });
+      } catch(e) {
+        
+      }
     }
 
     /* Change skin fro processmap END */

From 24c46233d8e14fbd851e4394df27ca1681144aba Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Fri, 22 Feb 2013 16:28:16 -0400
Subject: [PATCH 2/2] BUG 10850 Cuando se borra una tarea de un proceso no se
 borra... SOLVED

- Derivation no were erased correctly.
- Was add validation in file processmap.
---
 gulliver/js/maborak/core/maborak.loader.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gulliver/js/maborak/core/maborak.loader.js b/gulliver/js/maborak/core/maborak.loader.js
index 056b3ed6e..445719fcc 100644
--- a/gulliver/js/maborak/core/maborak.loader.js
+++ b/gulliver/js/maborak/core/maborak.loader.js
@@ -861,7 +861,8 @@ else
 if(deri.type===5||deri.type===8)
 {var toTask=this.data.db.task[this.tools.getIndexOfUid(deri.to[i].task)];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:""});}}}}}
-this.parent.dom.setStyle(task.object.elements.derivation,{background:""});task.derivation={to:[]};if(rec)
+this.parent.dom.setStyle(task.object.elements.derivation,{background:""});if(spec==false&&typeof(rec)=='undefined'){task.derivation={to:[]};}
+if(rec)
 {var tdb=this.data.db.task;for(var i=0;i<tdb.length;i++)
 {var der=tdb[i].derivation.to||[];for(var j=0;j<der.length;j++)
 {if(der[j].task===uid)
@@ -908,7 +909,10 @@ var d=document.createElement("div");this.parent.dom.setStyle(d,{position:"absolu
 panel.options={limit:true,size:{w:770,h:450},position:{x:50,y:50,center:true},title:G_STRINGS.ID_PROCESSMAP_TASK_STEPS+" "+data.label.substr(0,82)+(data.label.length>=82?"...":""),theme:this.options.theme,statusBar:false,control:{close:true},fx:{modal:true}};panel.tab={width:300,optWidth:120,step:(this.parent.browser.isIE?3:4),options:[{title:G_STRINGS.ID_PROCESSMAP_STEPS,content:this.parent.closure({instance:this,method:iForm,args:[panel,index,1]}),selected:true},{title:G_STRINGS.ID_PROCESSMAP_CONDITIONS,content:this.parent.closure({instance:this,method:iForm,args:[panel,index,2]})},{title:G_STRINGS.ID_PROCESSMAP_TRIGGERS,content:this.parent.closure({instance:this,method:iForm,args:[panel,index,3]})}]};panel.events={remove:function(){}.extend(this)};panel.make();}.extend(this,index)},{image:"/images/users.png",text:G_STRINGS.ID_PROCESSMAP_USERS_AND_GROUPS,launch:function(event,index){var panel;this.tmp.usersPanel=panel=new leimnud.module.panel();panel.options={limit:true,size:{w:450,h:300},position:{x:50,y:50,center:true},title:G_STRINGS.ID_PROCESSMAP_USERS_AND_GROUPS+": "+task.label.substr(0,30)+(task.label.length>=30?"...":""),theme:this.options.theme,control:{close:true,resize:false},fx:{modal:true},statusBar:false,fx:{modal:true}};panel.events={remove:function(){}.extend(this)};panel.make();panel.loader.show();var r;panel.currentRPC=r=new leimnud.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=users&data="+{tas_uid:task.uid,pro_uid:this.options.uid}.toJSONString()});r.callback=function(rpc,panel)
 {panel.loader.hide();var scs=rpc.xmlhttp.responseText.extractScript();panel.addContent(rpc.xmlhttp.responseText);scs.evalScript();}.extend(this,panel);r.make();}.extend(this,index)},{image:"/images/users.png",text:G_STRINGS.ID_PROCESSMAP_USERS_AND_GROUPS_ADHOC,launch:function(event,index){var panel;this.tmp.usersPanel=panel=new leimnud.module.panel();panel.options={limit:true,size:{w:450,h:300},position:{x:50,y:50,center:true},title:G_STRINGS.ID_PROCESSMAP_USERS_AND_GROUPS_ADHOC+": "+task.label.substr(0,27)+(task.label.length>=27?"...":""),theme:this.options.theme,control:{close:true,resize:false},fx:{modal:true},statusBar:false,fx:{modal:true}};panel.make();panel.loader.show();var r;panel.currentRPC=r=new leimnud.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=users_adhoc&data="+{tas_uid:task.uid,pro_uid:this.options.uid}.toJSONString()});r.callback=function(rpc,panel)
 {panel.loader.hide();var scs=rpc.xmlhttp.responseText.extractScript();panel.addContent(rpc.xmlhttp.responseText);scs.evalScript();}.extend(this,panel);r.make();}.extend(this,index)},{image:"/images/rules.png",text:G_STRINGS.ID_PROCESSMAP_WORKFLOW_PATTERNS,launch:this.patternPanel.args(index)},{image:"/images/delete_rules.png",text:G_STRINGS.ID_PROCESSMAP_WORKFLOW_DELETE_PATTERNS,launch:this.parent.closure({instance:this,method:function(){var data=this.data.db.task[index];if(typeof(data.derivation.type)!='undefined'){new this.parent.module.app.confirm().make({label:G_STRINGS.ID_PROCESSMAP_WORKFLOW_CONFIRM_DELETE_PATTERNS+'"'+data.label+'"?',action:function(){var db=this.data.db,task=db.task[index];var vars={tas_uid:task.uid,pro_uid:this.options.uid};var aData={};aData.tas_uid=vars.tas_uid;aData.data=[];this.data.build.derivation(aData);var r=new leimnud.module.rpc.xmlhttp({url:this.options.dataServer,args:'action=deleteAllRoutes&data='+vars.toJSONString()});r.make();}.extend(this)});}
-else{new leimnud.module.app.alert().make({label:G_STRINGS.ID_NO_DERIVATIONS_DEFINED});}},args:index})},{image:"/images/delete.png",text:G_STRINGS.ID_PROCESSMAP_DELETE_TASK,launch:this.parent.closure({instance:this,method:function(index){var data=this.data.db.task[index];var r=new leimnud.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=taskCases&data="+{pro_uid:this.options.uid,task_uid:data.uid}.toJSONString()});r.callback=function(rpc){var rs=rpc.xmlhttp.responseText.parseJSON();var casesNumRec=rs.casesNumRec;if(casesNumRec==0){new this.parent.module.app.confirm().make({label:G_STRINGS.ID_PROCESSMAP_CONFIRM_DELETE_TASK+" "+data.label,action:function(){data.object.drag.flush();this.dropables.derivation.unregister(data.object.dropIndex);this.data.render.deleteDerivation(data.uid,true);this.parent.dom.remove(data.object.elements);var r2=new leimnud.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=deleteTask&data="+{pro_uid:this.options.uid,tas_uid:data.uid}.toJSONString()});r2.make();}.extend(this)});}
+else{new leimnud.module.app.alert().make({label:G_STRINGS.ID_NO_DERIVATIONS_DEFINED});}},args:index})},{image:"/images/delete.png",text:G_STRINGS.ID_PROCESSMAP_DELETE_TASK,launch:this.parent.closure({instance:this,method:function(index){var data=this.data.db.task[index];var r=new leimnud.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=taskCases&data="+{pro_uid:this.options.uid,task_uid:data.uid}.toJSONString()});r.callback=function(rpc){var rs=rpc.xmlhttp.responseText.parseJSON();var casesNumRec=rs.casesNumRec;if(casesNumRec==0){new this.parent.module.app.confirm().make({label:G_STRINGS.ID_PROCESSMAP_CONFIRM_DELETE_TASK+" "+data.label,action:function(){data.object.drag.flush();this.dropables.derivation.unregister(data.object.dropIndex);this.data.render.deleteDerivation(data.uid,true);this.parent.dom.remove(data.object.elements);var taskUidDelete=this.data.db.task[data.object.dropIndex].uid;for(var i=0;i<(this.data.db.task).length;i++){for(var j=0;j<(this.data.db.task[i]).length;j++){this.data.db.task[i]=this.data.db.task[i+1];}
+var j=0;var itemDelete=(this.data.db.task[i]).derivation;while(j<itemDelete.to.length){if(itemDelete.to[j].task==taskUidDelete){for(var k=j;k<itemDelete.to.length;k++){itemDelete.to[k]=itemDelete.to[k+1];}
+(itemDelete.to).splice((itemDelete.to).length-1,1);}else{j++;}}}
+var r2=new leimnud.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=deleteTask&data="+{pro_uid:this.options.uid,tas_uid:data.uid}.toJSONString()});r2.make();}.extend(this)});}
 else{var msg=_("ID_TASK_CANT_DELETE");msg=msg.replace("{0}",data.label);msg=msg.replace("{1}",casesNumRec);new this.parent.module.app.info().make({label:msg});}}.extend(this);r.make();return;if(confirm(G_STRINGS.ID_PROCESSMAP_CONFIRM_DELETE_TASK+" "+data.label))
 {data.object.drag.flush();this.dropables.derivation.unregister(data.object.dropIndex);this.data.render.deleteDerivation(data.uid);this.parent.dom.remove(data.object.elements);var r=new leimnud.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=deleteTask&data="+{pro_uid:this.options.uid,tas_uid:data.uid}.toJSONString()});r.make();}},args:index})},{simage:"/images/properties.png",text:G_STRINGS.ID_PROCESSMAP_PROPERTIES,launch:this.parent.closure({instance:this,method:function(index){var panel;var iForm=function(panel,index,ifo){if(typeof(panel.flag)=='undefined'){if(!saveDataTaskTemporal(ifo)){var tabPass=panel.tabSelected;panel.tabSelected=panel.tabLastSelected;panel.tabLastSelected=tabPass;panel.flag=true;panel.makeTab();return false;}}
 delete panel.flag;panel.command(panel.loader.show);var r=new this.parent.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=editTaskProperties&data="+{uid:data.uid,iForm:ifo,index:index}.toJSONString()});r.callback=this.parent.closure({instance:this,method:function(index,rpc,panel){panel.command(panel.loader.hide);panel.clearContent();var scs=rpc.xmlhttp.responseText.extractScript();panel.addContent(rpc.xmlhttp.responseText.stripScript());scs.evalScript();},args:[index,r,panel]});r.make();}
@@ -978,7 +982,7 @@ else
 {dse.className="pm_separatorDOn___"+this.options.theme+" pm_separatorOut___"+this.options.theme;}
 else
 {dse.className="pm_separatorDOff___"+this.options.theme+" pm_separatorOut___"+this.options.theme;}}.extend(this,dse);}
-if(this.options.rw===true){var bd=this.parent.dom.capture("tag.body 0");var sm=this.parent.dom.element("pm_submenu");this.parent.dom.setStyle(bd,{backgroundColor:"buttonface"});this.parent.dom.setStyle(sm,{height:25});}
+if(this.options.rw===true){try{var bd=this.parent.dom.capture("tag.body 0");var sm=this.parent.dom.element("pm_submenu");this.parent.dom.setStyle(bd,{backgroundColor:"buttonface"});this.parent.dom.setStyle(sm,{height:25});}catch(e){}}
 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:(maximunX>this.options.size.w?maximunX+200:this.options.size.w),h:heightPanel},position:{x:200,y:0,centerX:true},title:"",titleBar:false,control:{resize:false},fx:{opacity:false,shadow:false,blinkToFront:false},theme:this.options.theme,target:this.options.target,modal:true,limit:true};this.panels.editor.setStyle={content:{background:"white url('"+this.options.images_dir+"bg_pm.gif') repeat fixed",backgroundPosition:"10 0"},containerWindow:{borderWidth:0,padding:0,backgroundColor:"buttonface"},titleBar:{background:"transparent",borderWidth:0,height:5},frontend:{backgroundColor:"buttonface"},backend:{backgroundColor:"buttonface"},status:{textAlign:"center"}};this.panels.editor.make();this.panels.editor.loader.show();this.panels.editor.addContentStatus(G_STRINGS.ID_PROCESSMAP_LOADING);this.data.load();if(this.options.rw===true)
 {this.data.render.buildingBlocks.panel();}},validate:function()
 {return(!this.options.target||!this.options.dataServer||!this.options.lang)?false:true;},addTask:function(evt,tp)