|
|
|
@ -707,12 +707,12 @@ class CoursesController < ApplicationController
|
|
|
|
|
|
|
|
|
|
if order == 1
|
|
|
|
|
# REDO:Extension
|
|
|
|
|
@students = @students.includes(user: :user_extension).order("user_extensions.student_id, course_members.id")
|
|
|
|
|
@students = @students.includes(user: :user_extension).order("user_extensions.student_id, users.login")
|
|
|
|
|
elsif order == 2
|
|
|
|
|
@students = @students.includes(:course_group).order("course_groups.position, course_members.id")
|
|
|
|
|
@students = @students.includes(:course_group).order("course_groups.position, users.login")
|
|
|
|
|
else
|
|
|
|
|
# REDO:Extension
|
|
|
|
|
@students = @students.includes(user: :user_extension).order("user_extensions.student_id, course_members.id")
|
|
|
|
|
@students = @students.includes(user: :user_extension).order("user_extensions.student_id, users.login")
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
if course_group_id.present?
|
|
|
|
|