diff options
| -rw-r--r-- | web/lib/api/search.rb | 6 | ||||
| -rw-r--r-- | web/public/js/taginfo.js | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/web/lib/api/search.rb b/web/lib/api/search.rb index 63b266f..6203d1f 100644 --- a/web/lib/api/search.rb +++ b/web/lib/api/search.rb @@ -14,7 +14,11 @@ class Taginfo < Sinatra::Base res = @db.select('SELECT * FROM search.ftsearch'). condition_if("value MATCH ?", query). - order_by([:count_all], 'DESC'). + order_by(params[:sortname], params[:sortorder]) { |o| + o.count_all + o.key + o.value + }. paging(params[:rp], params[:page]). execute() diff --git a/web/public/js/taginfo.js b/web/public/js/taginfo.js index 090ada0..176e987 100644 --- a/web/public/js/taginfo.js +++ b/web/public/js/taginfo.js @@ -429,6 +429,7 @@ var create_flexigrid_for = { url: '/api/2/search/values?q=' + encodeURIComponent(query), colModel: [ { display: 'Count', name: 'count_all', width: 80, sortable: true, align: 'right' }, + { display: 'Key', name: 'key', width: 250, sortable: true, align: 'left' }, { display: 'Value', name: 'value', width: 500, sortable: true, align: 'left' } ], sortname: 'count_all', @@ -438,6 +439,7 @@ var create_flexigrid_for = { data.rows = jQuery.map(data.data, function(row, i) { return { 'cell': [ print_with_ts(row.count_all), + link_to_key(row.key), link_to_value_with_highlight(row.key, row.value, query) ] }; }); |