hell's teeth that was painful. Make relation roles editable within TagViewer

diff --git a/TODO.txt b/TODO.txt
index 66d0cf97179e0fc5e468f58fb184f2994e842081..38d8b508fa130d2223abe4fb8957358e32922e43 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -31,8 +31,7 @@ Potlatch 2: main outstanding issues
 
 ** Doesn't always update selected tab when you select a new entity
 ** Doesn't update selected tab when you change the relations on an entity
 
 ** Doesn't always update selected tab when you select a new entity
 ** Doesn't update selected tab when you change the relations on an entity

-** Direct click-to-edit of relation role should actually work
-** Double-clicking a relation to edit it comes up with the POIs!
+* Double-clicking a relation to edit it sometimes comes up with the POIs (how to reproduce?)

 * Dynamic reloading of stylesheet/map_features, so that you don't need to reload the full page when editing them
 * If a select name is too long then, the select menu seems to give a horizontal scrollbar instead of the name of the item e.g. cuisine#Coffee Shop
 * If you have both inputSets names and buildingAddress, and name= key is filled in then the basic tab will get both, surely only name should be shown and building name should be ignored e.g. cafes. [Actually this was an issue of addr: being missing from one of them, however this may still be a problem for other overlapping inputSets]
 * Dynamic reloading of stylesheet/map_features, so that you don't need to reload the full page when editing them
 * If a select name is too long then, the select menu seems to give a horizontal scrollbar instead of the name of the item e.g. cuisine#Coffee Shop
 * If you have both inputSets names and buildingAddress, and name= key is filled in then the basic tab will get both, surely only name should be shown and building name should be ignored e.g. cafes. [Actually this was an issue of addr: being missing from one of them, however this may still be a problem for other overlapping inputSets]

diff --git a/net/systemeD/potlatch2/TagViewer.mxml b/net/systemeD/potlatch2/TagViewer.mxml
index 99c78efa2745385a6d7516b09fc71360f2bb9091..a8b2e42af26d95a59e58cb48847d17c2e2f142a4 100644 (file)
--- a/net/systemeD/potlatch2/TagViewer.mxml
+++ b/net/systemeD/potlatch2/TagViewer.mxml
@@ -319,6 +319,7 @@
               rel.removeEventListener(Connection.RELATION_MEMBER_REMOVED, entityRelationMemberChanged);
           }
           listeningToRelations = [];
               rel.removeEventListener(Connection.RELATION_MEMBER_REMOVED, entityRelationMemberChanged);
           }
           listeningToRelations = [];

+          relationsGrid.removeEventListener(DataGridEvent.ITEM_EDIT_END, relationRoleChanged);

       }
             
       private function resetRelationsGrid(entity:Entity):void {
       }
             
       private function resetRelationsGrid(entity:Entity):void {


@@ -343,8 +344,22 @@
               listeningToRelations.push(rel);
           }
           relationsGrid.dataProvider = relations;
               listeningToRelations.push(rel);
           }
           relationsGrid.dataProvider = relations;

+          relationsGrid.addEventListener(DataGridEvent.ITEM_EDIT_END, relationRoleChanged, false, -100);

       }
       
       }
       

+      private function relationRoleChanged(event:DataGridEvent):void {
+               if (event.dataField != 'role') { return; }      // shouldn't really happen
+
+               var relations:Array=event.currentTarget.dataProvider.toArray();
+               var props:Object=relations[event.rowIndex];
+
+               var relation:Relation=props['relation'];
+               var index:uint=props['index'];
+               var newRole:String=event.itemRenderer.data['role'];
+
+               relation.setMember(index, new RelationMember(selectedEntity,newRole));
+      }
+

       private function relationTagChanged(event:TagEvent):void {
           resetRelationsGrid(selectedEntity);
       }
       private function relationTagChanged(event:TagEvent):void {
           resetRelationsGrid(selectedEntity);
       }