ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-18 15:18:12 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'undirty-on-refresh-1046' into transaction-clearing-1059

Browse Source 
Conflicts:
	platform/commonUI/edit/src/actions/SaveAsAction.js
This commit is contained in:
Victor Woeltjen
2016-07-14 11:53:39 -07:00
parent eb5493e37b 48b271b7ca
commit 4c7ad6d93a
5 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/commonUI/edit/src/capabilities/TransactionalPersistenceCapability.js
View File

@ -49,6 +49,7 @@ define(
this.domainObject = domainObject;
this.$q = $q;
this.persistPending = false;
this.removeFromTransaction = undefined;
}
/**
@ -75,6 +76,7 @@ define(
});
} else {
self.persistPending = false;
self.removeFromTransaction = undefined;
//Model is undefined in persistence, so return undefined.
return self.$q.when(undefined);
}
@ -82,7 +84,8 @@ define(
if (this.transactionService.isActive()) {
if (!this.persistPending) {
this.transactionService.addToTransaction(onCommit, onCancel);
this.removeFromTransaction = this.transactionService
.addToTransaction(onCommit, onCancel);
this.persistPending = true;
}
//Need to return a promise from this function
@ -93,6 +96,11 @@ define(
};
TransactionalPersistenceCapability.prototype.refresh = function () {
if (this.persistPending) {
this.persistPending = false;
this.removeFromTransaction();
this.removeFromTransaction = undefined;
}
return this.persistenceCapability.refresh();
};