Resolved merge conflicts

2025-06-19 15:43:48 +00:00 · 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/representers/EditRepresenter.js
+++ b/platform/commonUI/edit/src/representers/EditRepresenter.js
@ -136,7 +136,7 @@ define(
                }
            });

-            if (representedObject.getCapability('status').get('editing')){
+            if (representedObject.hasCapability('editor') && representedObject.getCapability('editor').isEditContextRoot()){
                setEditing();
            }
        };