alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made changes to error reporting

Browse Source
This commit is contained in:
Andrew Henry
2015-11-04 22:07:26 -08:00
parent 2bdc95eb95 2815d97682
commit 8e85675732
101 changed files with 7959 additions and 3303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
platform/entanglement/src/actions/CopyAction.js
View File

@@ -101,13 +101,27 @@ define(
self.notificationService.info("Copying complete.");
},
function error(errorDetails){
self.$log.error("Error copying objects. ", errorDetails);
//Show more general error message
self.notificationService.notify({
var errorMessage = {
title: "Error copying objects.",
severity: "error",
hint: errorDetails.message
});
hint: errorDetails.message,
minimized: true, // want the notification to be minimized initially (don't show banner)
options: [{
label: "OK",
callback: function() {
self.dialogService.dismiss();
}
}]
};
self.dialogService.dismiss();
if (self.notification) {
self.notification.dismiss(); // Clear the progress notification
}
self.$log.error("Error copying objects. ", errorDetails);
//Show more general error message
self.notificationService.notify(errorMessage);
self.dialogService.showBlockingMessage(errorMessage);
},
function notification(details){

2
platform/entanglement/src/services/CopyService.js
View File

@@ -200,7 +200,7 @@ define(
this.buildCopyPlan(domainObject, parent, deferred.notify)
.then(this.persistObjects(deferred.notify))
.then(this.addClonesToParent(parent, deferred.notify))
.then(deferred.resolve);
.then(deferred.resolve, deferred.reject);
return deferred.promise;
} else {
throw new Error(