apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up UI error handling

Browse Source 
Restore error messages for widgets -- as the default error handler
will be overridden if an error fn is specified, thus rendering no
message
This commit is contained in:
Brian Federle 2011-12-08 16:28:32 -08:00
parent 477676c168
commit 77ee3cedd5
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/scripts/sharedFunctions.js
View File

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

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

@ -49,12 +49,12 @@
close(); close();
}, },
error: function(args) { error: function(message) {
$wizard.remove(); $wizard.remove();
$('div.overlay').remove(); $('div.overlay').remove();
if (args.message) { if (message) {
//cloudStack.dialog.notice({ message: args.message }); cloudStack.dialog.notice({ message: message });
} }
} }
} }

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

@ -37,12 +37,12 @@
close(); close();
}, },
error: function(args) { error: function(message) {
$wizard.remove(); $wizard.remove();
$('div.overlay').remove(); $('div.overlay').remove();
if (args.message) { if (message) {
//cloudStack.dialog.notice({ message: args.message }); cloudStack.dialog.notice({ message: message });
} }
} }
} }

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

@ -220,9 +220,9 @@
} }
); );
}, },
error: function(data){ error: function(message){
// if (data.message) if (message)
// cloudStack.dialog.notice({ message: data.message }); cloudStack.dialog.notice({ message: message });
} }
} }
}; };
@ -372,9 +372,9 @@
if (options.success) options.success(args); if (options.success) options.success(args);
}, },
error: function(args) { error: function(message) {
if (args.message) { if (message) {
//cloudStack.dialog.notice({ message: args.message }); cloudStack.dialog.notice({ message: message });
$edit.hide(), $edit.hide(),
$label.html(oldVal).fadeIn(); $label.html(oldVal).fadeIn();
$instanceRow.closest('div.data-table').dataTable('refresh'); $instanceRow.closest('div.data-table').dataTable('refresh');

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

@ -1,4 +1,4 @@
(function($) { (function($, cloudStack) {
/** /**
* Notification handling * Notification handling
*/ */
@ -89,7 +89,7 @@
incomplete: function(args) {}, incomplete: function(args) {},
error: function(args) { error: function(args) {
if (args.message) { if (args.message) {
//cloudStack.dialog.notice({ message: args.message }); cloudStack.dialog.notice({ message: args.message });
} }
clearInterval(pollTimer); clearInterval(pollTimer);
@ -287,4 +287,4 @@
if ($popup.size()) if ($popup.size())
notifications.popup.reposition($popup, $popup.data('notifications-attach-to')); notifications.popup.reposition($popup, $popup.data('notifications-attach-to'));
}); });
})(window.jQuery); })(window.jQuery, cloudStack);