Resolved Merge conflicts, removed previously deleted files

2016-05-12 16:05:27 -07:00
parent bd686790dc
commit cf9eb3f602
27 changed files with 28 additions and 1664 deletions
--- a/platform/commonUI/edit/src/actions/SaveAction.js
+++ b/platform/commonUI/edit/src/actions/SaveAction.js
@@ -85,8 +85,8 @@ define(
        SaveAction.appliesTo = function (context) {
            var domainObject = (context || {}).domainObject;
            return domainObject !== undefined &&
-                domainObject.hasCapability("editor") &&
-                domainObject.getModel().persisted !== undefined;
+                domainObject.getModel().persisted !== undefined &&
+                domainObject.getCapability("status").get("editing");
        };

        return SaveAction;