[New Edit Mode] #659 Fix to prevent multi-composition with same object, fix to prevent composition of object with self

2016-02-10 16:34:00 -08:00
parent 668c02f278
commit 10e0acddb3
3 changed files with 9 additions and 6 deletions
--- a/platform/containment/src/ComposeActionPolicy.js
+++ b/platform/containment/src/ComposeActionPolicy.js
@@ -55,11 +55,12 @@ define(
            this.policyService = this.policyService || this.getPolicyService();

            // ...and delegate to the composition policy
-            return this.policyService.allow(
-                'composition',
-                containerType,
-                selectedType
-            );
+            return containerObject.getId() !== selectedObject.getId() &&
+                this.policyService.allow(
+                    'composition',
+                    containerType,
+                    selectedType
+                );
        };

        /**