diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index af2a25f1d..d14382ae8 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -14,13 +14,21 @@ class StudentWorkController < ApplicationController @show_all = @is_teacher || @homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3 if @show_all if @homework.homework_type == 1 || @is_teacher || User.current.admin? - @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name + if @order == "name" + @stundet_works = @homework.student_works.joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}") + else + @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name + end else my_work = @homework.student_works.where(:user_id => User.current.id) if my_work.empty? @stundet_works = [] else - @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name + if @order == "name" + @stundet_works = @homework.student_works.joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}") + else + @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name + end end end else #学生 diff --git a/app/views/student_work/_student_work_title.html.erb b/app/views/student_work/_student_work_title.html.erb index 9e50ed72d..2a3a5e124 100644 --- a/app/views/student_work/_student_work_title.html.erb +++ b/app/views/student_work/_student_work_title.html.erb @@ -2,7 +2,10 @@ 学号