extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 04:41:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Never display an empty confirm message

Browse Source
This commit is contained in:
Nathan Gray 2014-01-15 15:18:23 +00:00
parent 4239ab815a
commit 47c6c74fbf
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
phpgwapi/js/egw_action/egw_action.js
View File

@ -509,7 +509,7 @@ egwAction.prototype.execute = function(_senders, _target)
if (this.data && (this.data.confirm || this.data.confirm_multiple) && this.onExecute.fcnt != window.nm_action && if (this.data && (this.data.confirm || this.data.confirm_multiple) && this.onExecute.fcnt != window.nm_action &&
typeof et2_dialog != 'undefined') // let old eTemplate run it's own confirmation from nextmatch_action.js typeof et2_dialog != 'undefined') // let old eTemplate run it's own confirmation from nextmatch_action.js
{ {
var msg = this.data.confirm; var msg = this.data.confirm || '';
if (_senders.length > 1) if (_senders.length > 1)
{ {
if (this.data.confirm_multiple) msg = this.data.confirm_multiple; if (this.data.confirm_multiple) msg = this.data.confirm_multiple;
@ -521,14 +521,17 @@ egwAction.prototype.execute = function(_senders, _target)
} }
} }
var self = this; var self = this;
et2_dialog.show_dialog(function(_button) if(msg.trim().length > 0)
{ {
if (_button == et2_dialog.YES_BUTTON) et2_dialog.show_dialog(function(_button)
{ {
return self.onExecute.exec(self, _senders, _target); if (_button == et2_dialog.YES_BUTTON)
} {
}, msg, self.data.hint, {}, et2_dialog.BUTTONS_YES_NO, et2_dialog.QUESTION_MESSAGE); return self.onExecute.exec(self, _senders, _target);
return; }
}, msg, self.data.hint, {}, et2_dialog.BUTTONS_YES_NO, et2_dialog.QUESTION_MESSAGE);
return;
}
} }
return this.onExecute.exec(this, _senders, _target); return this.onExecute.exec(this, _senders, _target);
}; };