Resolved merge conflicts

platform/commonUI/edit/src/capabilities/EditorCapability.js

@@ -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;
     }

platform/commonUI/edit/src/policies/EditableLinkPolicy.js

@@ -35,11 +35,12 @@ define([], function () {
     }
 
     EditableLinkPolicy.prototype.allow = function (action, context) {
-        var key = action.getMetadata().key;
+        var key = action.getMetadata().key,
+            object;
 
         if (key === 'link') {
-            return !((context.selectedObject || context.domainObject)
-                .hasCapability('editor'));
+            object = context.selectedObject || context.domainObject;
+            return !(object.hasCapability("editor") && object.getCapability("editor").isEditing());
         }
 
         // Like all policies, allow by default.

platform/commonUI/edit/src/policies/EditableMovePolicy.js

@@ -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.

platform/commonUI/edit/src/policies/EditableViewPolicy.js

@@ -37,7 +37,7 @@ define(
             // If a view is flagged as non-editable, only allow it
             // while we're not in Edit mode.
             if ((view || {}).editable === false) {
-                return !domainObject.hasCapability('editor');
+                return !(domainObject.hasCapability('editor') && domainObject.getCapability('editor').isEditing());
             }
 
             // Like all policies, allow by default.