IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-28 01:41:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Ajax error handling.

Browse Source 
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
This commit is contained in:
Endi S. Dewata 2011-05-20 11:27:58 -05:00 committed by Adam Young
parent 887f53cd67
commit 0238cb845a
8 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
install/ui/associate.js
View File

@ -1021,7 +1021,6 @@ IPA.association_facet = function (spec) {
function on_error(xhr, text_status, error_thrown) {
var summary = $('span[name=summary]', that.table.tfoot).empty();
summary.append('<p>Error: '+error_thrown.name+'</p>');
summary.append('<p>'+error_thrown.title+'</p>');
summary.append('<p>'+error_thrown.message+'</p>');
}

1
install/ui/details.js
View File

@ -621,7 +621,6 @@ IPA.details_facet = function(spec) {
command.on_error = function(xhr, text_status, error_thrown) {
var details = $('.details', that.container).empty();
details.append('<p>Error: '+error_thrown.name+'</p>');
details.append('<p>'+error_thrown.title+'</p>');
details.append('<p>'+error_thrown.message+'</p>');
};

1
install/ui/dns.js
View File

@ -476,7 +476,6 @@ IPA.records_facet = function(spec) {
function on_error(xhr, text_status, error_thrown) {
var summary = $('span[name=summary]', that.table.tfoot).empty();
summary.append('<p>Error: '+error_thrown.name+'</p>');
summary.append('<p>'+error_thrown.title+'</p>');
summary.append('<p>'+error_thrown.message+'</p>');
}

1
install/ui/hbac.js
View File

@ -999,7 +999,6 @@ IPA.hbacrule_accesstime_widget = function (spec) {
function on_error(xhr, text_status, error_thrown) {
var summary = $('span[name=summary]', that.table.tfoot).empty();
summary.append('<p>Error: '+error_thrown.name+'</p>');
summary.append('<p>'+error_thrown.title+'</p>');
summary.append('<p>'+error_thrown.message+'</p>');
}

14
install/ui/ipa.js
View File

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

1
install/ui/search.js
View File

@ -268,7 +268,6 @@ IPA.search_facet = function(spec) {
function on_error(xhr, text_status, error_thrown) {
var summary = $('span[name=summary]', that.table.tfoot).empty();
summary.append('<p>Error: '+error_thrown.name+'</p>');
summary.append('<p>'+error_thrown.title+'</p>');
summary.append('<p>'+error_thrown.message+'</p>');
}

1
install/ui/webui.js
View File

@ -156,7 +156,6 @@ $(function() {
function init_on_error(xhr, text_status, error_thrown) {
var container = $('#content').empty();
container.append('<p>Error: '+error_thrown.name+'</p>');
container.append('<p>'+error_thrown.title+'</p>');
container.append('<p>'+error_thrown.message+'</p>');
}

1
install/ui/widget.js
View File

@ -1374,7 +1374,6 @@ IPA.table_widget = function (spec) {
function on_error(xhr, text_status, error_thrown) {
var summary = $('span[name=summary]', that.tfoot).empty();
summary.append('<p>Error: '+error_thrown.name+'</p>');
summary.append('<p>'+error_thrown.title+'</p>');
summary.append('<p>'+error_thrown.message+'</p>');
}