ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-20 05:37:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Persistence] Handle refresh after edit

Browse Source 
Correctly handle Discard changes after leaving Edit mode when
conflicts are detected; WTD-1033.
This commit is contained in:
Victor Woeltjen 2015-03-24 15:53:27 -07:00
parent 6b43256afd
commit 0090732f71
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
platform/commonUI/edit/src/capabilities/EditablePersistenceCapability.js
View File

@ -29,6 +29,13 @@ define(
cache.markDirty(editableObject);
};
// Delegate refresh to the original object; this avoids refreshing
// the editable instance of the object, and ensures that refresh
// correctly targets the "real" version of the object.
persistence.refresh = function () {
return domainObject.getCapability('persistence').refresh();
};
return persistence;
}

2
platform/commonUI/edit/src/capabilities/EditorCapability.js
View File

@ -50,7 +50,7 @@ define(
// Persist the underlying domain object
function doPersist() {
return persistenceCapability.persist();
return domainObject.getCapability('persistence').persist();
}
return {

4
platform/persistence/queue/src/PersistenceFailureHandler.js
View File

@ -62,7 +62,9 @@ define(
// Discard changes for a failed refresh
function discard(failure) {
return failure.persistence.refresh(true);
var persistence =
failure.domainObject.getCapability('persistence');
return persistence.refresh();
}
// Discard changes associated with a failed save