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

Displaying AJAX URL in error message.

Browse Source 
The ipa_error_handler() has been modified to display the AJAX URL
that is having a problem. The ipa_cmd() error handler is now invoked
using call() to pass 'this' object which contains the URL.
This commit is contained in:
Endi S. Dewata
2010-10-06 15:09:14 -05:00
committed by Endi Sukma Dewata
parent 127ff317ce
commit de35a3e341
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
install/static/associate.js
View File

@@ -244,6 +244,7 @@ function AssociationList(obj, pkey, manyObj, associationColumns, jobj, associati
function refresh_on_error(xhr, text_status, error_thrown) {
var search_results = $('.search-results', jobj).empty();
search_results.append('<p>Error: '+error_thrown.name+'</p>');
search_results.append('<p>URL: '+this.url+'</p>');
search_results.append('<p>'+error_thrown.message+'</p>');
}

1
install/static/details.js
View File

@@ -121,6 +121,7 @@ function ipa_details_load(jobj, pkey, on_win, on_fail)
var details = $('.details', jobj).empty();
details.append('<p>Error: '+error_thrown.name+'</p>');
details.append('<p>URL: '+this.url+'</p>');
details.append('<p>'+error_thrown.message+'</p>');
};

19
install/static/ipa.js
View File

@@ -80,18 +80,18 @@ function ipa_cmd(name, args, options, win_callback, fail_callback, objname)
var error_thrown = {
name: 'HTTP Error '+xhr.status,
message: data ? xhr.statusText : "No response"
}
ipa_error_handler(xhr, text_status, error_thrown);
};
ipa_error_handler.call(this, xhr, text_status, error_thrown);
} else if (data.error) {
var error_thrown = {
name: 'IPA Error '+data.error.code,
message: data.error.message
}
ipa_error_handler(xhr, text_status, error_thrown);
};
ipa_error_handler.call(this, xhr, text_status, error_thrown);
} else if (win_callback) {
win_callback(data, text_status, xhr);
win_callback.call(this, data, text_status, xhr);
}
}
@@ -99,10 +99,13 @@ function ipa_cmd(name, args, options, win_callback, fail_callback, objname)
ipa_dialog.empty();
ipa_dialog.attr('title', 'Error: '+error_thrown.name);
ipa_dialog.append('<p>URL: '+this.url+'</p>');
if (error_thrown.message) {
ipa_dialog.append('<p>'+error_thrown.message+'</p>');
}
var that = this;
ipa_dialog.dialog({
modal: true,
width: 400,
@@ -113,13 +116,13 @@ function ipa_cmd(name, args, options, win_callback, fail_callback, objname)
},
'Cancel': function() {
ipa_dialog.dialog('close');
fail_callback(xhr, text_status, error_thrown);
fail_callback.call(that, xhr, text_status, error_thrown);
}
}
});
};
}
id = ipa_jsonrpc_id++;
var id = ipa_jsonrpc_id++;
var method_name = name;

1
install/static/search.js
View File

@@ -190,6 +190,7 @@ function search_load(jobj, criteria, on_win, on_fail)
var search_results = $('.search-results', jobj);
search_results.append('<p>Error: '+error_thrown.name+'</p>');
search_results.append('<p>URL: '+this.url+'</p>');
search_results.append('<p>'+error_thrown.message+'</p>');
}

1
install/static/webui.js
View File

@@ -86,6 +86,7 @@ $(function() {
function init_on_error(xhr, text_status, error_thrown) {
var navigation = $('#navigation').empty();
navigation.append('<p>Error: '+error_thrown.name+'</p>');
navigation.append('<p>URL: '+this.url+'</p>');
navigation.append('<p>'+error_thrown.message+'</p>');
}