IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

webui: do not show login error when switching back from otp sync screen

Browse Source 
Errors should reflect only a result of last operation.

https://fedorahosted.org/freeipa/ticket/4470

Reviewed-By: Endi Sukma Dewata <edewata@redhat.com>
This commit is contained in:
Petr Vobornik
2014-08-22 13:47:11 +02:00
parent 050431c4dd
commit 5e36cc5215
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
install/ui/src/freeipa/widget.js
View File

@@ -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;
};

1
install/ui/src/freeipa/widgets/LoginScreen.js
View File

@@ -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 });
},