From a72bbee503594fa1cd60e53c0c8cf2b4bee80244 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 19 Jun 2015 14:59:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E5=90=8D=E5=AD=97=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=BF=87=E6=BB=A4=E6=90=9C=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index d14382ae8..3ca836773 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -15,7 +15,7 @@ class StudentWorkController < ApplicationController if @show_all if @homework.homework_type == 1 || @is_teacher || User.current.admin? if @order == "name" - @stundet_works = @homework.student_works.joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}") + @stundet_works = search_homework_member @homework.student_works.joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}"),@name else @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name end @@ -25,7 +25,7 @@ class StudentWorkController < ApplicationController @stundet_works = [] else if @order == "name" - @stundet_works = @homework.student_works.joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}") + @stundet_works = search_homework_member @homework.student_works.joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}"),@name else @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name end