Use tags and descriptions

diff --git a/TODO.txt b/TODO.txt
index 756bdde03eb675ea78aef89dadbff8168473d32f..19ccf9c6dc012cde6bf832e7984a38d3c78e17ae 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -74,7 +74,6 @@ Potlatch 2: main outstanding issues
 * Make the connection, not the savemanager, in charge of sorting out the oauth stuff?
 * Ensure the oauth dialog pops up if there's no oauth credentials
 * Rework the loading text
-* Show descriptions, tags (needs rails_port changes)
 * Have a remove button for removing loaded traces
 * Have a check button for simplifying traces
 * Refactor the importer.as so that downloading the files can be done via the connection, not just directly

diff --git a/net/systemeD/halcyon/connection/XMLConnection.as b/net/systemeD/halcyon/connection/XMLConnection.as
index 0b2aff8e9f3616e62d7f46dfef87bd3143537c46..c0445904ef2f7d37f9adf35835ab3410aa127a1a 100644 (file)
--- a/net/systemeD/halcyon/connection/XMLConnection.as
+++ b/net/systemeD/halcyon/connection/XMLConnection.as
@@ -335,6 +335,12 @@ package net.systemeD.halcyon.connection {
               var t:Object = {};
               t.id = traceData.@id;
               t.name = traceData.@name;
+              t.description = traceData.description;
+              var tags:Array = [];
+              for each(var tag:XML in traceData.tag) {
+                tags.push(String(tag));
+              }
+              t.tags = tags.join(" ");
               t.url = Connection.apiBaseURL+"gpx/"+t.id+"/data";
               addTrace(t);
             }

diff --git a/net/systemeD/potlatch2/mygpx/MyGpxDialog.mxml b/net/systemeD/potlatch2/mygpx/MyGpxDialog.mxml
index f0b02937c04b897a06bdf9edc39af5c83530270e..3ed5679a0970623a6955abcea01568492bc05591 100644 (file)
--- a/net/systemeD/potlatch2/mygpx/MyGpxDialog.mxml
+++ b/net/systemeD/potlatch2/mygpx/MyGpxDialog.mxml
@@ -81,7 +81,8 @@
     <mx:columns>
             <mx:DataGridColumn editable="false" dataField="id" headerText="id" width="45"/>
             <mx:DataGridColumn editable="false" dataField="name" headerText="filename"/>
-            <mx:DataGridColumn editable="false" dataField="url" headerText="url"/>
+            <mx:DataGridColumn editable="false" dataField="description" headerText="description"/>
+            <mx:DataGridColumn editable="false" dataField="tags" headerText="tags"/>
             <mx:DataGridColumn editable="false">
               <mx:itemRenderer>
                 <mx:Component>