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

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

Browse Source
This commit is contained in:
Marco Antonio Nina
2012-06-06 11:32:02 -04:00
parent 8c684b9228 0f2891e762
commit c970e07048
10 changed files with 4263 additions and 4193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);
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;

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);
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();
}
});