From 29f451026c59f6021a71b8ec3edfbcb29a6588ae Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 10 Sep 2019 14:12:52 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E7=9A=84=E5=8D=87=E5=BA=8F=E5=92=8C=E9=99=8D=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/courses_controller.rb | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index f6fae91db..d9ddcf2d1 100644
--- a/app/controllers/courses_controller.rb
+++ b/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?
From 7574c4fe73ef9f154f01b0a6913fc0b5195305b7 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 10 Sep 2019 14:27:26 +0800
Subject: [PATCH 2/5] =?UTF-8?q?/*=20=E8=A7=A3=E5=86=B3=E9=BC=A0=E6=A0=87?=
=?UTF-8?q?=E6=A1=86=E9=80=89=E6=97=B6=EF=BC=8C=E5=B7=A6=E8=BE=B9=E7=AC=AC?=
=?UTF-8?q?=E4=B8=80=E5=88=97=E6=B2=A1=E9=AB=98=E4=BA=AE=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=20*/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/App.css | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/public/react/src/App.css b/public/react/src/App.css
index 42e40f8c8..f44822049 100644
--- a/public/react/src/App.css
+++ b/public/react/src/App.css
@@ -71,7 +71,10 @@ html, body {
/* 某些情况下，被cm盖住了 */
z-index: 99;
}
-
+/* 解决鼠标框选时，左边第一列没高亮的问题 */
+.CodeMirror .CodeMirror-lines pre.CodeMirror-line, .CodeMirror .CodeMirror-lines pre.CodeMirror-line-like {
+ padding: 0 12px ;
+}
/* antd扩展 */
From 51a7f8f0834e1f09c14f498841cc104fc149e64b Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 10 Sep 2019 15:15:30 +0800
Subject: [PATCH 3/5] remove test
---
public/react/public/index.html | 1 -
1 file changed, 1 deletion(-)
diff --git a/public/react/public/index.html b/public/react/public/index.html
index de539ffba..166760eab 100755
--- a/public/react/public/index.html
+++ b/public/react/public/index.html
@@ -22,7 +22,6 @@
-->
EduCoder