ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-05-09 12:03:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed blocking dialog

Browse Source
This commit is contained in:
Andrew Henry 2015-11-03 21:31:19 -08:00
parent 05481dcab5
commit 4e69ca50fb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,6 +66,7 @@ define(
CopyAction.prototype.perform = function() { CopyAction.prototype.perform = function() {
var self = this, var self = this,
notification, notification,
dialog,
notificationModel = { notificationModel = {
title: "Copying objects", title: "Copying objects",
unknownProgress: false, unknownProgress: false,
@ -84,8 +85,8 @@ define(
In the second phase, the copying is taking place, and the user In the second phase, the copying is taking place, and the user
is shown non-invasive banner notifications at the bottom of the screen. is shown non-invasive banner notifications at the bottom of the screen.
*/ */
if (phase.toLowerCase() === 'preparing'){ if (phase.toLowerCase() === 'preparing' && !dialog){
self.dialogService.showBlockingMessage({ dialog = self.dialogService.showBlockingMessage({
title: "Preparing to copy objects", title: "Preparing to copy objects",
unknownProgress: true, unknownProgress: true,
severity: "info", severity: "info",

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

@ -99,7 +99,6 @@ define(
delete modelClone.model.persisted; delete modelClone.model.persisted;
delete modelClone.model.modified; delete modelClone.model.modified;
return $q.when(originalObject.useCapability('composition')).then(function(composees){ return $q.when(originalObject.useCapability('composition')).then(function(composees){
progress({phase: "preparing"}); progress({phase: "preparing"});
return (composees || []).reduce(function(promise, composee){ return (composees || []).reduce(function(promise, composee){
//If the object is composed of other //If the object is composed of other
@ -191,7 +190,7 @@ define(
var $q = this.$q, var $q = this.$q,
deferred = $q.defer(); deferred = $q.defer();
if (this.validate(domainObject, parent)) { if (this.validate(domainObject, parent)) {
this.buildCopyPlan(domainObject, parent, deferred.notify) this.buildCopyPlan(domainObject, parent, deferred.notify)
.then(this.persistObjects(deferred.notify)) .then(this.persistObjects(deferred.notify))
.then(this.addClonesToParent(parent, deferred.notify)) .then(this.addClonesToParent(parent, deferred.notify))
.then(deferred.resolve); .then(deferred.resolve);