Resolved merge conflicts

2016-05-12 16:09:53 -07:00
parent 4b786d3536
commit d00e13e4ee
8 changed files with 10 additions and 10 deletions
--- a/platform/commonUI/edit/src/actions/SaveAsAction.js
+++ b/platform/commonUI/edit/src/actions/SaveAsAction.js
@@ -158,6 +158,7 @@ define(
            var domainObject = (context || {}).domainObject;
            return domainObject !== undefined &&
                domainObject.hasCapability("editor") &&
+                domainObject.getCapability("editor").inEditContext() &&
                domainObject.getModel().persisted === undefined;
        };