Resolved merge conflicts
This commit is contained in:
@@ -37,8 +37,8 @@ define([], function () {
|
||||
selectedObject = context.selectedObject,
|
||||
key = action.getMetadata().key;
|
||||
|
||||
if (key === 'move' && domainObject.hasCapability('editor')) {
|
||||
return !!selectedObject && selectedObject.hasCapability('editor');
|
||||
if (key === 'move' && domainObject.hasCapability('editor') && domainObject.getCapability('editor').isEditing()) {
|
||||
return !!selectedObject && selectedObject.hasCapability('editor') && selectedObject.getCapability('editor').isEditing();
|
||||
}
|
||||
|
||||
// Like all policies, allow by default.
|
||||
|
||||
Reference in New Issue
Block a user