Resolved Merge conflicts, removed previously deleted files

2016-05-12 16:05:27 -07:00
parent bd686790dc
commit cf9eb3f602
27 changed files with 28 additions and 1664 deletions
--- a/platform/commonUI/edit/src/capabilities/TransactionalPersistenceCapability.js
+++ b/platform/commonUI/edit/src/capabilities/TransactionalPersistenceCapability.js
@@ -43,7 +43,7 @@ define(
        TransactionalPersistenceCapability.prototype.persist = function () {
            var domainObject = this.domainObject,
                dirtyModelCache = this.dirtyModelCache;
-            if (this.transactionService.isActive()) {
+            if (this.transactionService.isActive() && !this.transactionService.isCommitting()) {
                dirtyModelCache.markDirty(domainObject);
                //Using $q here because need to return something
                // from which 'catch' can be chained