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/actions/SaveAction.js
+++ b/platform/commonUI/edit/src/actions/SaveAction.js
@@ -85,8 +85,9 @@ define(
        SaveAction.appliesTo = function (context) {
            var domainObject = (context || {}).domainObject;
            return domainObject !== undefined &&
-                domainObject.getModel().persisted !== undefined &&
-                domainObject.getCapability("status").get("editing");
+                domainObject.hasCapability('editor') &&
+                domainObject.getCapability('editor').isEditContextRoot() &&
+                domainObject.getModel().persisted !== undefined;
        };

        return SaveAction;