Merge branch 'develop' into dev_aliyun

app/controllers/courses_controller.rb

@@ -708,6 +708,7 @@ class CoursesController < ApplicationController
   def students
     search = params[:search].present? ? params[:search].strip : nil
     order = params[:order].present? ? params[:order].to_i : 0
+    sort = params[:sort].present? ? params[:sort] : "desc"
     course_group_id = params[:course_group_id].present? ? params[:course_group_id].to_i : nil
 
     @students = CourseMember.students(@course)
@@ -719,12 +720,12 @@ class CoursesController < ApplicationController
 
     if order == 1
       # REDO:Extension
-      @students = @students.includes(user: :user_extension).order("user_extensions.student_id, users.login")
+      @students = @students.includes(user: :user_extension).order("user_extensions.student_id #{sort}, users.login #{sort}")
     elsif order == 2
-      @students = @students.includes(:course_group).order("course_groups.position, users.login")
+      @students = @students.includes(:course_group).order("course_groups.position #{sort}, users.login #{sort}")
     else
       # REDO:Extension
-      @students = @students.includes(user: :user_extension).order("user_extensions.student_id, users.login")
+      @students = @students.includes(user: :user_extension).order("user_extensions.student_id #{sort}, users.login #{sort}")
     end
 
     if course_group_id.present?