From 6cbd47ced2b925f5dace83de9d35ab6b030a1d1a Mon Sep 17 00:00:00 2001
From: nccu <nccu@test174.(none)>
Date: Mon, 8 Dec 2014 15:19:37 +0800
Subject: [PATCH] fix unit sort

---
 app/controllers/admin/news_admins_controller.rb | 2 ++
 app/controllers/admin/news_controller.rb        | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/news_admins_controller.rb b/app/controllers/admin/news_admins_controller.rb
index 6a8fb97..d647f6b 100644
--- a/app/controllers/admin/news_admins_controller.rb
+++ b/app/controllers/admin/news_admins_controller.rb
@@ -8,6 +8,7 @@ class Admin::NewsAdminsController < OrbitAdminController
   def index
     @unit_table_fields = ['news.unit','news.department']
     @unit = Unit.new
+    sort = (!params[:sort].blank? ? {params[:sort].to_sym=>params[:order]} : {:id=>"asc"})
     @units = Unit.order_by(sort)
   end
 
@@ -20,6 +21,7 @@ class Admin::NewsAdminsController < OrbitAdminController
   def edit
     @unit = Unit.find(params[:id])
     @unit_table_fields = ['news.unit','news.department']
+    sort = (!params[:sort].blank? ? {params[:sort].to_sym=>params[:order]} : {:id=>"asc"})
     @units = Unit.order_by(sort)
 
     @url = admin_news_admin_path(@unit)
diff --git a/app/controllers/admin/news_controller.rb b/app/controllers/admin/news_controller.rb
index a22105d..5d2361c 100644
--- a/app/controllers/admin/news_controller.rb
+++ b/app/controllers/admin/news_controller.rb
@@ -34,7 +34,8 @@ class Admin::NewsController < OrbitAdminController
     @statuses = []
     @news_bulletin = NewsBulletin.new
     @news_bulletin.email_sentdate = Time.now
-    @unit = Unit.all
+    sort = (!params[:sort].blank? ? {params[:sort].to_sym=>params[:order]} : {:id=>"asc"})
+    @unit = Unit.all.order_by(sort)
   end
 
   def create
@@ -70,7 +71,8 @@ class Admin::NewsController < OrbitAdminController
 
   def edit
     if can_edit_or_delete?(@news_bulletin)
-      @unit = Unit.all
+      sort = (!params[:sort].blank? ? {params[:sort].to_sym=>params[:order]} : {:id=>"asc"})
+      @unit = Unit.all.order_by(sort)
       @department = Department.where(:unit_id => @news_bulletin.unit_id)
       @tags = @module_app.tags
       @categories = @module_app.categories.enabled