diff options
author | Adam Young <ayoung@redhat.com> | 2011-07-08 10:15:16 -0400 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2011-07-08 17:34:55 +0000 |
commit | 30492ef3faad5eabeb91930795fbfd413a732932 (patch) | |
tree | ccca73dd98ee11a7c38089a6684173651fb3ac14 /install | |
parent | 2337fb57601a29e41d9a94ed161104740cd8027c (diff) | |
download | freeipa-30492ef3faad5eabeb91930795fbfd413a732932.tar.gz freeipa-30492ef3faad5eabeb91930795fbfd413a732932.tar.xz freeipa-30492ef3faad5eabeb91930795fbfd413a732932.zip |
clear errors on reset
https://fedorahosted.org/freeipa/ticket/1446
Diffstat (limited to 'install')
-rw-r--r-- | install/ui/details.js | 2 | ||||
-rw-r--r-- | install/ui/test/details_tests.js | 2 | ||||
-rw-r--r-- | install/ui/widget.js | 10 |
3 files changed, 10 insertions, 4 deletions
diff --git a/install/ui/details.js b/install/ui/details.js index 6a2def7fb..746769702 100644 --- a/install/ui/details.js +++ b/install/ui/details.js @@ -155,7 +155,6 @@ IPA.details_section = function(spec) { for (var j=0; j<fields.length; j++) { var field = fields[j]; - var span = $('span[name='+field.name+']', this.container).first(); field.load(record); } }; @@ -164,7 +163,6 @@ IPA.details_section = function(spec) { var fields = that.fields.values; for (var i=0; i<fields.length; i++) { var field = fields[i]; - var span = $('span[name='+field.name+']', this.container).first(); field.reset(); } }; diff --git a/install/ui/test/details_tests.js b/install/ui/test/details_tests.js index 71e6bf98e..1b19f4b3e 100644 --- a/install/ui/test/details_tests.js +++ b/install/ui/test/details_tests.js @@ -170,7 +170,7 @@ test("Testing details lifecycle: create, setup, load.", function(){ widget.save = function() { save_called = true; - widget.widget_save(); + return widget.widget_save(); }; return widget; } diff --git a/install/ui/widget.js b/install/ui/widget.js index 0ec9a968b..5eb58f634 100644 --- a/install/ui/widget.js +++ b/install/ui/widget.js @@ -140,6 +140,12 @@ IPA.widget = function(spec) { that.valid = true; var values = that.save(); + if (!values){ + return; + } + if (values.length ===0 ){ + return; + } var value = values[0]; if (!value) { return; @@ -264,6 +270,7 @@ IPA.widget = function(spec) { that.reset = function() { that.update(); + that.validate(); that.set_dirty(false); }; @@ -1704,11 +1711,12 @@ IPA.entity_select_widget = function(spec) { that.reset = function() { that.entity_filter.val(that.values[0]); - that.set_dirty(false); populate_select(that.values[0]); if (editable){ that.edit_box.val(that.values[0]); } + that.validate(); + that.set_dirty(false); }; that.load = function(record) { |