diff options
author | Petr Vobornik <pvoborni@redhat.com> | 2014-08-22 13:47:11 +0200 |
---|---|---|
committer | Petr Vobornik <pvoborni@redhat.com> | 2014-09-08 12:42:16 +0200 |
commit | 5e36cc5215209294c9728fa4c2034d4c248acd68 (patch) | |
tree | f6e528dafdacd20cfda4cc08ac04e98f6ba655dd /install | |
parent | 050431c4dd70f024b1644137fb0ad4881ed9e32b (diff) | |
download | freeipa-5e36cc5215209294c9728fa4c2034d4c248acd68.tar.gz freeipa-5e36cc5215209294c9728fa4c2034d4c248acd68.tar.xz freeipa-5e36cc5215209294c9728fa4c2034d4c248acd68.zip |
webui: do not show login error when switching back from otp sync screen
Errors should reflect only a result of last operation.
https://fedorahosted.org/freeipa/ticket/4470
Reviewed-By: Endi Sukma Dewata <edewata@redhat.com>
Diffstat (limited to 'install')
-rw-r--r-- | install/ui/src/freeipa/widget.js | 27 | ||||
-rw-r--r-- | install/ui/src/freeipa/widgets/LoginScreen.js | 1 |
2 files changed, 24 insertions, 4 deletions
diff --git a/install/ui/src/freeipa/widget.js b/install/ui/src/freeipa/widget.js index 4bdf273db..84afac021 100644 --- a/install/ui/src/freeipa/widget.js +++ b/install/ui/src/freeipa/widget.js @@ -5677,7 +5677,8 @@ exp.alert_helper = IPA.alert_helper = { name: name, text: text, cls: 'alert alert-danger', - icon: 'fa fa-exclamation-circle' + icon: 'fa fa-exclamation-circle', + type: 'error' }; }, @@ -5692,7 +5693,8 @@ exp.alert_helper = IPA.alert_helper = { name: name, text: text, cls: 'alert alert-warning', - icon: 'fa fa-warning' + icon: 'fa fa-warning', + type: 'warning' }; }, @@ -5707,7 +5709,8 @@ exp.alert_helper = IPA.alert_helper = { name: name, text: text, cls: 'alert alert-info', - icon: 'fa fa-info-circle' + icon: 'fa fa-info-circle', + type: 'info' }; }, @@ -5722,7 +5725,8 @@ exp.alert_helper = IPA.alert_helper = { name: name, text: text, cls: 'alert alert-success', - icon: 'fa fa-check-circle-o' + icon: 'fa fa-check-circle-o', + type: 'success' }; }, @@ -5818,6 +5822,21 @@ exp.validation_summary_widget = IPA.validation_summary_widget = function(spec) { that.render_items(); }; + that.remove_all = function(type) { + + if (!type) that.items.empty(); + + for (var i=0, l=that.items.length; i<l; i++) { + var alert = that.items.get_value_by_index(i); + if (alert.type !== type) continue; + that.items.remove(alert.name); + i--; + l--; + } + + that.render_items(); + }; + return that; }; diff --git a/install/ui/src/freeipa/widgets/LoginScreen.js b/install/ui/src/freeipa/widgets/LoginScreen.js index 2c5002016..fb7ccccc6 100644 --- a/install/ui/src/freeipa/widgets/LoginScreen.js +++ b/install/ui/src/freeipa/widgets/LoginScreen.js @@ -170,6 +170,7 @@ define(['dojo/_base/declare', on_sync: function() { var user = this.get_field('username').get_value()[0]; + this.get_widget('validation').remove_all('error'); this.emit('require-otp-sync', { source: this, user: user }); }, |