diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2011-10-26 18:21:11 -0500 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2011-10-27 15:03:33 +0000 |
| commit | 916d08719b355bec6b8be5e8dd702883037c5eec (patch) | |
| tree | f0d4780654887631ea5dcf0c8e2d993599e3593d /install/ui/details.js | |
| parent | a486f49a3726934f99763cc6ae93a41dafc40deb (diff) | |
| download | freeipa-916d08719b355bec6b8be5e8dd702883037c5eec.tar.gz freeipa-916d08719b355bec6b8be5e8dd702883037c5eec.tar.xz freeipa-916d08719b355bec6b8be5e8dd702883037c5eec.zip | |
Fixed inconsistent details facet validation.
The details facet validation has been moved out of update() such
that all subclasses perform consistent validation.
Ticket #1455
Diffstat (limited to 'install/ui/details.js')
| -rw-r--r-- | install/ui/details.js | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/install/ui/details.js b/install/ui/details.js index 022b005bc..98f48d0f9 100644 --- a/install/ui/details.js +++ b/install/ui/details.js @@ -374,7 +374,7 @@ IPA.details_facet = function(spec) { icon: 'reset-icon', 'class': 'details-reset action-button-disabled', click: function() { - if(!that.update_button.hasClass('action-button-disabled')) { + if (!that.update_button.hasClass('action-button-disabled')) { that.reset(); } return false; @@ -387,9 +387,19 @@ IPA.details_facet = function(spec) { icon: 'update-icon', 'class': 'details-update action-button-disabled', click: function() { - if(!that.update_button.hasClass('action-button-disabled')) { - that.update(); + if (that.update_button.hasClass('action-button-disabled')) return false; + + if (!that.validate()) { + var dialog = IPA.message_dialog({ + title: IPA.messages.dialogs.validation_title, + message: IPA.messages.dialogs.validation_message + }); + dialog.open(); + return false; } + + that.update(); + return false; } }).appendTo(that.controls); @@ -628,15 +638,6 @@ IPA.details_facet = function(spec) { on_error: on_error }); - if (!that.validate()) { - var dialog = IPA.message_dialog({ - title: IPA.messages.dialogs.validation_title, - message: IPA.messages.dialogs.validation_message - }); - dialog.open(); - return; - } - var record = {}; that.save(record); |