From 6cb2a5562f447f23c49bb6f82ee93fcdb62703b3 Mon Sep 17 00:00:00 2001
From: gonglexin <18008490802@163.com>
Date: Thu, 30 Oct 2014 22:03:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E6=89=B9=E4=BD=9C=E4=B8=9A=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_attach_controller.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb
index aa7bc506f..904cbeeea 100644
--- a/app/controllers/homework_attach_controller.rb
+++ b/app/controllers/homework_attach_controller.rb
@@ -12,11 +12,13 @@ class HomeworkAttachController < ApplicationController
   #获取未批作业列表
   def get_not_batch_homework
     sort, direction = params[:sort], params[:direction]
+    order_by = sort == 'score'? "s_score #{direction}" : "created_at #{direction}"
+    
     teachers = find_course_teachers @course
     all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM (SELECT homework_attaches.*,
         (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN #{teachers}) AS t_score,
         (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN #{teachers}) AS s_score
-        FROM homework_attaches WHERE bid_id = #{@bid.id} ORDER BY s_score DESC,created_at ASC) AS table1
+        FROM homework_attaches WHERE bid_id = #{@bid.id} ORDER BY #{order_by}) AS table1
         WHERE table1.t_score IS NULL")
 
     @homework_list = paginateHelper all_homework_list,10
@@ -40,7 +42,7 @@ class HomeworkAttachController < ApplicationController
     @homework_list = paginateHelper all_homework_list,10
     @direction = direction == 'asc'? 'desc' : 'asc'
     respond_to do |format|
-      format.js
+      format.js.
     end
   end