Resolved merge conflicts

2016-05-12 16:07:39 -07:00
parent cf9eb3f602
commit 433dd87e51
8 changed files with 59 additions and 19 deletions
--- a/platform/commonUI/edit/src/policies/EditableViewPolicy.js
+++ b/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.