Resolved merge conflicts

This commit is contained in:
Henry
2016-05-12 16:07:39 -07:00
parent cf9eb3f602
commit 433dd87e51
8 changed files with 59 additions and 19 deletions

View File

@ -39,6 +39,20 @@ define(
this.domainObject.getCapability('status').set('editing', true);
};
function isEditing (domainObject) {
return domainObject.getCapability('status').get('editing') ||
domainObject.hasCapability('context') && isEditing(domainObject.getCapability('context').getParent());
}
/**
* Determines whether this object, or any of its ancestors are
* currently being edited.
* @returns boolean
*/
EditorCapability.prototype.isEditing = function () {
return isEditing(this.domainObject);
};
EditorCapability.prototype.save = function () {
var domainObject = this.domainObject;
return this.transactionService.commit().then(function() {
@ -60,8 +74,10 @@ define(
return this.dirtyModelCache.isDirty(this.domainObject);
};
//TODO: add 'appliesTo'. EditorCapability should not be available
// for objects that should not be edited
EditorCapability.prototype.appliesTo = function(context) {
var domainObject = context.domainObject;
return domainObject && domainObject.getType().hasFeature("creation");
}
return EditorCapability;
}