Merge pull request #611 from Jake0oo0/add-sorting

Sort forums and categories by order (Changed to position)

Author: radar

app/controllers/forem/admin/categories_controller.rb

@@ -35,7 +35,7 @@ def destroy
       private
 
       def category_params
-        params.require(:category).permit(:name)
+        params.require(:category).permit(:name, :position)
       end
 
       def find_category

app/controllers/forem/forums_controller.rb

@@ -4,7 +4,7 @@ class ForumsController < Forem::ApplicationController
     helper 'forem/topics'
 
     def index
-      @categories = Forem::Category.all
+      @categories = Forem::Category.order('position DESC')
     end
 
     def show

app/models/forem/category.rb

@@ -7,6 +7,7 @@ class Category < ActiveRecord::Base
 
     has_many :forums
     validates :name, :presence => true
+    validates :position, numericality: { only_integer: true }
 
     def to_s
       name

app/models/forem/concerns/.keep

@@ -15,11 +15,11 @@ class Forum < ActiveRecord::Base
     has_many :moderator_groups
 
     validates :category, :name, :description, :presence => true
+    validates :position, numericality: { only_integer: true }
 
     alias_attribute :title, :name
 
-    # Fix for #339
-    default_scope { order(:name) }
+    default_scope { order(:position) }
 
     def last_post_for(forem_user)
       if forem_user && (forem_user.forem_admin? || moderator?(forem_user))

app/models/forem/forum.rb

@@ -1,4 +1,5 @@
 <%= simple_form_for [forem, :admin, @category] do |f| %>
   <%= f.input :name %>
+  <%= f.input :position %>
   <%= f.submit :class => "btn btn-primary" %>
 <% end %>

app/views/forem/admin/categories/_form.html.erb

@@ -1,6 +1,7 @@
 <%= simple_form_for [forem, :admin, @forum] do |f| %>
   <%= f.association :category, :include_blank => false %>
   <%= f.input :title %>
+  <%= f.input :position %>
   <%= f.input :description, :as => :text %>
 
   <h3><%= t('forem.admin.forum.moderator_groups') %></h3>

app/views/forem/admin/forums/_form.html.erb

@@ -0,0 +1,5 @@
+class AddPositionToCategories < ActiveRecord::Migration
+  def change
+    add_column :forem_categories, :position, :integer, :default => 0
+  end
+end

db/migrate/20140917034000_add_position_to_categories.rb

@@ -0,0 +1,5 @@
+class AddPositionToForums < ActiveRecord::Migration
+  def change
+    add_column :forem_forums, :position, :integer, :default => 0
+  end
+end

db/migrate/20140917201619_add_position_to_forums.rb

@@ -9,9 +9,9 @@
 
   it "is scoped by default" do
     if ActiveRecord::Base.connection.class.to_s =~ /Mysql/
-      Forem::Forum.all.to_sql.should =~ /ORDER BY `forem_forums`.`name` ASC/
+      Forem::Forum.all.to_sql.should =~ /ORDER BY `forem_forums`.`position` ASC/
     else
-      Forem::Forum.all.to_sql.should =~ /ORDER BY \"forem_forums\".\"name\" ASC/
+      Forem::Forum.all.to_sql.should =~ /ORDER BY \"forem_forums\".\"position\" ASC/
     end
   end