diff options
author | Endi S. Dewata <edewata@redhat.com> | 2011-05-20 11:27:58 -0500 |
---|---|---|
committer | Adam Young <ayoung@redhat.com> | 2011-05-20 14:01:02 -0400 |
commit | 0238cb845a724969990be3c8a45ef572296b5de1 (patch) | |
tree | 0699b9c06681fcce5afdd413b0daac7df4544841 /install/ui/ipa.js | |
parent | 887f53cd67d91418d1e64ad1d1b699d26df09f17 (diff) | |
download | freeipa-0238cb845a724969990be3c8a45ef572296b5de1.tar.gz freeipa-0238cb845a724969990be3c8a45ef572296b5de1.tar.xz freeipa-0238cb845a724969990be3c8a45ef572296b5de1.zip |
Fixed Ajax error handling.
The IPA.command has been modified not to insert a title into the error
object thrown by Ajax operation because the object could be immutable.
Ticket #1240
Diffstat (limited to 'install/ui/ipa.js')
-rw-r--r-- | install/ui/ipa.js | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/install/ui/ipa.js b/install/ui/ipa.js index f2ffcf1d5..8f11b92df 100644 --- a/install/ui/ipa.js +++ b/install/ui/ipa.js @@ -298,7 +298,7 @@ IPA.command = function(spec) { IPA.error_dialog.dialog({ modal: true, - title: error_thrown.title, + title: error_thrown.name, width: 400, buttons: buttons, close: function() { @@ -333,10 +333,6 @@ IPA.command = function(spec) { } } - if (!error_thrown.title) { - error_thrown.title = 'AJAX Error: '+error_thrown.name; - } - if (that.retry) { dialog_open.call(this, xhr, text_status, error_thrown); @@ -350,7 +346,7 @@ IPA.command = function(spec) { if (!data) { IPA.hide_activity_icon(); var error_thrown = { - title: 'HTTP Error '+xhr.status, + name: 'HTTP Error '+xhr.status, url: this.url, message: data ? xhr.statusText : "No response" }; @@ -359,7 +355,7 @@ IPA.command = function(spec) { } else if (data.error) { // error_handler() calls IPA.hide_activity_icon() error_handler.call(this, xhr, text_status, /* error_thrown */ { - title: 'IPA Error '+data.error.code, + name: 'IPA Error '+data.error.code, message: data.error.message }); @@ -461,7 +457,7 @@ IPA.batch_command = function (spec) { if (command.on_error) command.on_error( xhr, text_status, { - title: 'Internal Error '+xhr.status, + name: 'Internal Error '+xhr.status, message: result ? xhr.statusText : "Internal error" } ); @@ -471,7 +467,7 @@ IPA.batch_command = function (spec) { xhr, text_status, { - title: 'IPA Error '+result.error.code, + name: 'IPA Error '+result.error.code, message: result.error.message } ); |