From e0cf3a8313b2643597c566fec8502ed0f335d22d Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Wed, 5 Jan 2011 21:20:31 +0700 Subject: Use AJAX status text as default error message. The ipa_cmd() error handler has been updated to use AJAX status text as the default error message. --- install/static/ipa.js | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/install/static/ipa.js b/install/static/ipa.js index ac8a0f26..b340d835 100644 --- a/install/static/ipa.js +++ b/install/static/ipa.js @@ -314,21 +314,25 @@ function ipa_cmd(name, args, options, win_callback, fail_callback, objname, comm } function error_handler(xhr, text_status, error_thrown) { - if (!error_thrown){ - error_thrown = {name:'unknown'} + + if (!error_thrown) { + error_thrown = { + name: xhr.responseText || 'Unknown Error', + message: xhr.statusText || 'Unknown Error' + } } - if (xhr.status === 401){ - error_thrown.name = 'Kerberos ticket no longer valid.'; + if (xhr.status === 401) { + error_thrown.name = 'Kerberos ticket no longer valid.'; if (IPA.messages && IPA.messages.ajax){ - error_thrown.message = IPA.messages.ajax["401"]; - }else{ + error_thrown.message = IPA.messages.ajax["401"]; + } else { error_thrown.message = - "Your kerberos ticket no longer valid."+ - "Please run kinit and then click 'retry'"+ - "If this is your first time running the IPA Web UI"+ - " "+ - "Follow these directions to configure your browser." + "Your kerberos ticket no longer valid. "+ + "Please run kinit and then click 'retry'. "+ + "If this is your first time running the IPA Web UI "+ + ""+ + "follow these directions to configure your browser." } } -- cgit