Projects on tag page: Show NULL value only if specific value not available.

3 files changed, 11 insertions, 17 deletions

diff --git a/web/lib/api/v4/key.rb b/web/lib/api/v4/key.rb
index 45a762d..f53376e 100644
--- a/web/lib/api/v4/key.rb
+++ b/web/lib/api/v4/key.rb
@@ -361,11 +361,10 @@ class Taginfo < Sinatra::Base
             condition('key = ?', key).
             condition_if("value LIKE ? ESCAPE '@' OR name LIKE ? ESCAPE '@'", q, q).
             order_by(@ap.sortname, @ap.sortorder) { |o|
-                o.project_name 'p.name'
-                o.project_name :key
+                o.project_name 'lower(p.name)'
                 o.project_name :value
                 o.tag :value
-                o.tag 'p.name'
+                o.tag 'lower(p.name)'
             }.
             paging(@ap).
             execute()
diff --git a/web/lib/api/v4/tag.rb b/web/lib/api/v4/tag.rb
index e1fd2cd..d46f03c 100644
--- a/web/lib/api/v4/tag.rb
+++ b/web/lib/api/v4/tag.rb
@@ -256,7 +256,7 @@ class Taginfo < Sinatra::Base
             :query => 'Only show results where the value matches this query (substring match, optional).'
         },
         :paging => :optional,
-        :sort => %w( project_name key value ),
+        :sort => %w( project_name tag ),
         :result => paging_results([
             [:project_id,       :STRING, 'Project ID'],
             [:project_name,     :STRING, 'Project name'],
@@ -277,26 +277,21 @@ class Taginfo < Sinatra::Base
         key = params[:key]
         value = params[:value]
         q = like_contains(params[:query])
-        total = @db.select('SELECT count(*) FROM projects.projects p, projects.project_tags t ON p.id=t.project_id').
+        total = @db.select('SELECT count(distinct project_id) FROM projects.projects p, projects.project_tags t ON p.id=t.project_id').
             condition("status = 'OK'").
             condition('key = ?', key).
             condition('value = ? OR VALUE IS NULL', value).
             condition_if("value LIKE ? ESCAPE '@' OR name LIKE ? ESCAPE '@'", q, q).
             get_first_value().to_i
 
-        res = @db.select('SELECT t.project_id, p.name, p.icon_url AS project_icon_url, t.key, t.value, t.description, t.doc_url, t.icon_url, t.on_node, t.on_way, t.on_relation, t.on_area FROM projects.projects p, projects.project_tags t ON p.id=t.project_id').
-            condition("status = 'OK'").
-            condition('key = ?', key).
-            condition('value = ? OR VALUE IS NULL', value).
+        res = @db.select("SELECT p.name, p.icon_url AS project_icon_url, t.* FROM (SELECT project_id, key, MAX(value) AS value FROM projects.project_tags WHERE key=? AND (value=? OR value IS NULL) GROUP BY project_id, key) AS s JOIN projects.project_tags t JOIN projects.projects p ON p.id=t.project_id AND t.project_id=s.project_id AND t.key=s.key AND (t.value=s.value OR (t.value IS NULL AND s.value IS NULL))", key, value).
+            condition("p.status = 'OK'").
             condition_if("value LIKE ? ESCAPE '@' OR name LIKE ? ESCAPE '@'", q, q).
             order_by(@ap.sortname, @ap.sortorder) { |o|
-                o.project_name 'p.name'
-                o.project_name :key
+                o.project_name 'lower(p.name)'
                 o.project_name :value
-                o.key :key
-                o.key :value
-                o.value :value
-                o.value :key
+                o.tag :value
+                o.tag 'lower(p.name)'
             }.
             paging(@ap).
             execute()
diff --git a/web/viewsjs/tag.js.erb b/web/viewsjs/tag.js.erb
index 52821ea..7cd9787 100644
--- a/web/viewsjs/tag.js.erb
+++ b/web/viewsjs/tag.js.erb
@@ -130,14 +130,14 @@ var create_flexigrid_for = {
             url: '/api/4/tag/projects?key=' + encodeURIComponent(key) + '&value=' + encodeURIComponent(value),
             colModel: [
                 { display: '<%= h(taginfo.project) %>', name: 'project_name', width: 280, sortable: true },
-                { display: '<%= h(osm.tag) %>', name: 'key', width: 220, sortable: true },
+                { display: '<%= h(osm.tag) %>', name: 'tag', width: 220, sortable: true },
                 { display: '<%= h(osm.objects) %>', name: 'objects', width:  80, sortable: false },
                 { display: '<%= h(page.projects.description) %>', name: 'description', width: 600, sortable: false, align: 'left' }
             ],
             searchitems: [
                 { display: '<%= h(taginfo.project) %>/<%= h(osm.value) %>', name: 'project_value' }
             ],
-            sortname: 'key',
+            sortname: 'tag',
             sortorder: 'asc',
             preProcess: function(data) {
                 data.rows = jQuery.map(data.data, function(row, i) {