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

[Edit] Fixed issue with cancel action throwing an error. Fixes #979

Browse Source
This commit is contained in:
Andrew Henry
2016-06-01 10:41:01 +01:00
parent dc577d4c24
commit b1266abf01
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,10 +67,17 @@ define(
}
function onCancel() {
return self.persistenceCapability.refresh().then(function (result) {
if (self.domainObject.getModel().persisted) {
//Fetch clean model from persistence
return self.persistenceCapability.refresh().then(function (result) {
self.persistPending = false;
return result;
});
} else {
self.persistPending = false;
return result;
});
//Model is undefined in persistence, so return undefined.
return self.$q.when(undefined);
}
}
if (this.transactionService.isActive()) {