Don't allow <different> to be committed as a role

diff --git a/net/systemeD/halcyon/connection/EntityCollection.as b/net/systemeD/halcyon/connection/EntityCollection.as
index 4530161f1bcb429568b410cf5d385a00b656e9ae..9f3f79dc183acd694724e7e6fbe909e60c988ce1 100644 (file)
--- a/net/systemeD/halcyon/connection/EntityCollection.as
+++ b/net/systemeD/halcyon/connection/EntityCollection.as
@@ -16,7 +16,7 @@ package net.systemeD.halcyon.connection {
                private var addedToRelationTimer:Timer;
                private var removedFromRelationTimer:Timer;
                private var delayedEvents:Array = [];
-               private static const DIFFERENT:String = "<different>";
+               public static const DIFFERENT:String = "<different>";
 
         public function EntityCollection(entities:Array) {
                        var conn:Connection=entities[0].connection;

diff --git a/net/systemeD/potlatch2/TagViewer.mxml b/net/systemeD/potlatch2/TagViewer.mxml
index 31510afe093a5b5921839efe103bd71a82be3090..8ae355b708d72f9a89a21701c8869cdf00b5d03c 100644 (file)
--- a/net/systemeD/potlatch2/TagViewer.mxml
+++ b/net/systemeD/potlatch2/TagViewer.mxml
@@ -751,6 +751,7 @@
                var newRole:String=event.itemRenderer.data['role'];
 
                if (selectedEntity is EntityCollection) {
+                       if (newRole==EntityCollection.DIFFERENT) return;
                        for each (var entity:Entity in EntityCollection(selectedEntity).entities) {
                                var indexes:Array=relation.findEntityMemberIndexes(entity);
                                for each (var index:int in indexes) {