Merge CDB-1442 into release/2.13.4

CartoDB · May 8, 2014 · 5175fa2 · 5175fa2
2 parents 9785e80 + 450ee7d
commit 5175fa2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb
@@ -22,7 +22,7 @@ def datasets
     viewed_user = User.where(username: user.strip.downcase).first
     return render_404 if viewed_user.nil?
 
-    @tags       = viewed_user.map_tags
+    @tags       = viewed_user.map_tags.sort_by{ |m| m.downcase }
 
     @username   = viewed_user.username
     @avatar_url = viewed_user.gravatar(request.protocol)
@@ -50,7 +50,7 @@ def datasets
           title:        dataset.name,
           description:  dataset.description,
           updated_at:   dataset.updated_at,
-          tags:         dataset.tags
+          tags:         dataset.tags.sort_by{ |m| m.downcase }
         }
       )
     end
@@ -67,7 +67,7 @@ def public
     viewed_user = User.where(username: user.strip.downcase).first
     return render_404 if viewed_user.nil?
 
-    @tags       = viewed_user.tags
+    @tags       = viewed_user.map_tags.sort_by{ |m| m.downcase }
 
     @username   = viewed_user.username
     @avatar_url = viewed_user.gravatar(request.protocol)

diff --git a/app/models/visualization/tags.rb b/app/models/visualization/tags.rb
@@ -35,7 +35,7 @@ def count(params={})
             SELECT name, count(*) as count
             FROM tags
             GROUP BY name
-            ORDER BY count(*)
+            #{order_from(params)}
           }, map_ids_for(user), types_from(params), limit_from(params)
         ).all.map(&:values)
       end #count
@@ -48,6 +48,11 @@ def map_ids_for(user)
         user.maps.map(&:id)
       end #map_ids
 
+      def order_from(params={})
+        order = params.fetch(:order, nil)
+        (order.nil? || order.empty?) ? ' ORDER BY count(*) ' : " ORDER BY #{order} "
+      end #order_from
+
       def privacy_from(params={})
         privacy = params.fetch(:privacy, nil)
         (privacy.nil? || privacy.empty?) ? Member::PRIVACY_VALUES : [privacy]

diff --git a/lib/assets/javascripts/cartodb/dashboard/filters/tag_dropdown.js b/lib/assets/javascripts/cartodb/dashboard/filters/tag_dropdown.js
@@ -82,6 +82,7 @@ cdb.admin.TagDropdown = cdb.ui.common.Dropdown.extend({
     var self = this;
     this.tags.fetch({
       data: {
+        order: "name",
         type: self.model.get("type")
       },
       success: function() {