etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 12309: Implement generic error handling

This commit is contained in:
Brian Federle 2011-12-02 14:58:54 -08:00
parent 0b54135edc
commit c067758a34
9 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/scripts/cloudStack.js
View File

@ -34,6 +34,15 @@
});
$(function() {
/**
* Generic error handling
*/
$.ajaxSetup({
error: function(data) {
cloudStack.dialog.notice({ message: parseXMLHttpResponse(data) });
}
});
var $container = $('#cloudStack3-container');
var loginArgs = {

1
ui/scripts/sharedFunctions.js
View File

@ -58,6 +58,7 @@ var pollAsyncJobResult = function(args) {
else if (result.jobstatus == 2) { // Failed
var msg = (result.jobresult.errortext == null)? "": result.jobresult.errortext;
args.error({message: msg});
cloudStack.dialog.notice({ message: msg });
}
}
},

2
ui/scripts/ui-custom/instanceWizard.js
View File

@ -54,7 +54,7 @@
$('div.overlay').remove();
if (args.message) {
cloudStack.dialog.notice({ message: args.message });
//cloudStack.dialog.notice({ message: args.message });
}
}
}

2
ui/scripts/ui-custom/login.js
View File

@ -61,7 +61,7 @@
});
},
error: function(args) {
cloudStack.dialog.notice({ message: 'Invalid username and/or password.' });
//cloudStack.dialog.notice({ message: 'Invalid username and/or password.' });
}
}
});

2
ui/scripts/ui-custom/zoneWizard.js
View File

@ -42,7 +42,7 @@
$('div.overlay').remove();
if (args.message) {
cloudStack.dialog.notice({ message: args.message });
//cloudStack.dialog.notice({ message: args.message });
}
}
}

1
ui/scripts/ui/dialog.js
View File

@ -372,6 +372,7 @@
'class': 'close',
click: function() {
$(this).dialog('destroy');
if (args.clickAction) args.clickAction();
}
}
]

6
ui/scripts/ui/widgets/detailView.js
View File

@ -199,8 +199,8 @@
);
},
error: function(args) {
if (args.message)
cloudStack.dialog.notice({ message: args.message });
// if (args.message)
// cloudStack.dialog.notice({ message: args.message });
}
}
});
@ -372,7 +372,7 @@
$value.html(originalValue);
});
if (args.message) cloudStack.dialog.notice({ message: args.message });
// if (args.message) cloudStack.dialog.notice({ message: args.message });
}
}
});

8
ui/scripts/ui/widgets/listView.js
View File

@ -221,8 +221,8 @@
);
},
error: function(data){
if (data.message)
cloudStack.dialog.notice({ message: data.message });
// if (data.message)
// cloudStack.dialog.notice({ message: data.message });
}
}
};
@ -343,7 +343,7 @@
},
error: function(args) {
if (args.message) {
cloudStack.dialog.notice({ message: args.message });
//cloudStack.dialog.notice({ message: args.message });
$edit.hide(),
$label.html(oldVal).fadeIn();
$instanceRow.closest('div.data-table').dataTable('refresh');
@ -898,7 +898,7 @@
},
error: function(args) {
if (args.message) {
cloudStack.dialog.notice({ message: args.message });
//cloudStack.dialog.notice({ message: args.message });
}
}
}

2
ui/scripts/ui/widgets/notifications.js
View File

@ -89,7 +89,7 @@
incomplete: function(args) {},
error: function(args) {
if (args.message) {
cloudStack.dialog.notice({ message: args.message });
//cloudStack.dialog.notice({ message: args.message });
}
clearInterval(pollTimer);