fix conflicts

2013-05-07 15:33:52 -07:00
parent c944d5315a 3ac080aae7
commit 4237215dad
5 changed files with 11 additions and 7 deletions
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -544,12 +544,18 @@ class Tag < ActiveRecord::Base
      elsif params[:order] == "date"
        q = q.reorder("id desc")

+      elsif params[:order] == "count"
+        q = q.reorder("post_count desc")
+
      elsif params[:sort] == "date"
        q = q.reorder("id desc")

      elsif params[:sort] == "name"
        q = q.reorder("name")

+      elsif params[:sort] == "count"
+        q = q.reorder("post_count desc")
+
      else
        q = q.reorder("id desc")
      end