fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 8942 Dialog box to edit conditions ... is too narrow SOLVED

Browse Source 
- This problem was resolved, at the same time was resolved a problem with the confirmation window.
This commit is contained in:
Alvaro Campos
2012-06-05 10:54:38 -04:00
parent ee66ddeb89
commit 14b738f974
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
workflow/engine/js/processmap/core/processmap.js
View File

@@ -917,16 +917,18 @@ var processmap=function(){
this.observers.lineas.unregister(deri.to[i].object.indexObserver); this.observers.lineas.unregister(deri.to[i].object.indexObserver);
} }
if(deri.type===5 || deri.type===8) if(deri.type===5 || deri.type===8)
{ {
var toTask = this.data.db.task[this.tools.getIndexOfUid(deri.to[i].task)]; var toTask = this.data.db.task[this.tools.getIndexOfUid(deri.to[i].task)];
toTask.object.inJoin = toTask.object.inJoin-1; if (typeof(toTask) != 'undefined') {
if(toTask.object.inJoin===0) toTask.object.inJoin = toTask.object.inJoin-1;
{ if(toTask.object.inJoin===0)
this.parent.dom.setStyle(toTask.object.elements.init,{ {
backgroundPosition:"0 0", this.parent.dom.setStyle(toTask.object.elements.init,{
background:"" backgroundPosition:"0 0",
}); background:""
} });
}
}
} }
} }
} }
@@ -2207,7 +2209,7 @@ var processmap=function(){
iHeight = 350; iHeight = 350;
break; break;
case 4: case 4:
iWidth = 500; iWidth = 600;
iHeight = 350; iHeight = 350;
break; break;
case 5: case 5:
@@ -2227,7 +2229,7 @@ var processmap=function(){
position:{x:50,y:50,center:true}, position:{x:50,y:50,center:true},
title :G_STRINGS.ID_PROCESSMAP_WORKFLOW_PATTERNS+": "+task.label, title :G_STRINGS.ID_PROCESSMAP_WORKFLOW_PATTERNS+": "+task.label,
theme :this.options.theme, theme :this.options.theme,
control :{close:true,resize:false}, control :{close:true,resize:true},
fx :{modal:true} fx :{modal:true}
}; };
panel.make(); panel.make();

3
workflow/engine/xmlform/patterns/patterns_ParallelJoin.xml
View File

@@ -39,6 +39,7 @@ leimnud.event.add(getField('ROU_NEXT_TASK'), 'change', modified);
//leimnud.event.add(getField('ROU_TO_LAST_USER'), 'change', modified); //leimnud.event.add(getField('ROU_TO_LAST_USER'), 'change', modified);
Pm.tmp.derivationsPanel.events.remove = function() { Pm.tmp.derivationsPanel.events.remove = function() {
if (bModified) { if (bModified) {
Pm.tmp.derivationsPanel.inRemove = false;
Pm.tmp.derivationsPanel.cancelClose=true; Pm.tmp.derivationsPanel.cancelClose=true;
new leimnud.module.app.confirm().make({ new leimnud.module.app.confirm().make({
label: G_STRINGS.ID_SAVE_DERIVATION_RULES_BEFORE_CLOSING, label: G_STRINGS.ID_SAVE_DERIVATION_RULES_BEFORE_CLOSING,
@@ -46,7 +47,7 @@ Pm.tmp.derivationsPanel.events.remove = function() {
Pm.tmp.derivationsPanel.cancelClose=false; Pm.tmp.derivationsPanel.cancelClose=false;
bModified = false; bModified = false;
getField('SAVE').onclick(); getField('SAVE').onclick();
}.extend(this), },
cancel: function() { cancel: function() {
Pm.tmp.derivationsPanel.cancelClose=false; Pm.tmp.derivationsPanel.cancelClose=false;
bModified = false; bModified = false;

5
workflow/engine/xmlform/patterns/patterns_Sequential.xml
View File

@@ -41,6 +41,7 @@ leimnud.event.add(getField('ROU_NEXT_TASK'), 'change', modified);
//leimnud.event.add(getField('ROU_TO_LAST_USER'), 'change', modified); //leimnud.event.add(getField('ROU_TO_LAST_USER'), 'change', modified);
Pm.tmp.derivationsPanel.events.remove = function() { Pm.tmp.derivationsPanel.events.remove = function() {
if (bModified) { if (bModified) {
Pm.tmp.derivationsPanel.inRemove = false;
Pm.tmp.derivationsPanel.cancelClose=true; Pm.tmp.derivationsPanel.cancelClose=true;
new leimnud.module.app.confirm().make({ new leimnud.module.app.confirm().make({
label: G_STRINGS.ID_SAVE_DERIVATION_RULES_BEFORE_CLOSING, label: G_STRINGS.ID_SAVE_DERIVATION_RULES_BEFORE_CLOSING,
@@ -48,10 +49,10 @@ Pm.tmp.derivationsPanel.events.remove = function() {
Pm.tmp.derivationsPanel.cancelClose=false; Pm.tmp.derivationsPanel.cancelClose=false;
bModified = false; bModified = false;
getField('SAVE').onclick(); getField('SAVE').onclick();
}.extend(this), },
cancel: function() { cancel: function() {
Pm.tmp.derivationsPanel.cancelClose=false; Pm.tmp.derivationsPanel.cancelClose=false;
bModified = false; bModified = false;
Pm.tmp.derivationsPanel.remove(); Pm.tmp.derivationsPanel.remove();
} }
}); });