Resolved merge conflicts

2016-05-12 16:14:31 -07:00
parent 5bf750c90c
commit 44f4a82fa1
37 changed files with 741 additions and 332 deletions
--- a/platform/commonUI/edit/src/policies/EditActionPolicy.js
+++ b/platform/commonUI/edit/src/policies/EditActionPolicy.js
@@ -73,7 +73,8 @@ define(
        function isEditing(context) {
            var domainObject = (context || {}).domainObject;
            return domainObject
-                && domainObject.getCapability('status').get('editing');
+                && domainObject.hasCapability('editor')
+                && domainObject.getCapability('editor').isEditContextRoot();
        }

        EditActionPolicy.prototype.allow = function (action, context) {