ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-20 16:10:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Resolved merge conflicts

Browse Source
This commit is contained in:
Henry
2016-05-12 16:03:19 -07:00
parent e5ef7c0c22
commit bd686790dc
11 changed files with 53 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/commonUI/edit/src/services/TransactionService.js
View File

@ -39,9 +39,8 @@ define(
}
TransactionService.prototype.startTransaction = function () {
if (this.transaction) {
throw "Transaction in progress";
}
if (this.transaction)
console.error("Transaction already in progress")
this.transaction = true;
};
@ -68,7 +67,7 @@ define(
}
return this.$q.all(
Object.keys(this.cache)
Object.keys(cache)
.map(keyToObject)
.map(objectToPromise))
.then(function () {
@ -93,7 +92,7 @@ define(
}
function objectToPromise(object) {
return object.getCapability('persistence').refresh();
return self.$q.when(object.getModel().persisted && object.getCapability('persistence').refresh());
}
return this.$q.all(Object.keys(cache)