From 721f1dd0d2c219396ea708113d779f7bc7b20d35 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 8 Aug 2019 17:31:46 +0800 Subject: [PATCH 1/2] bottom --- .../react/src/modules/courses/members/modal/AddTeacherModal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/members/modal/AddTeacherModal.js b/public/react/src/modules/courses/members/modal/AddTeacherModal.js index 02bf59106..003db7348 100644 --- a/public/react/src/modules/courses/members/modal/AddTeacherModal.js +++ b/public/react/src/modules/courses/members/modal/AddTeacherModal.js @@ -205,7 +205,7 @@ class AddTeacherModal extends Component{ {` .demo-loading-container { position: absolute; - bottom: 93px; + bottom: 210px; width: 82%; text-align: center; } From a7e061ac69e9866def46f583a1ffab1bbed36826 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 8 Aug 2019 17:32:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E8=80=81=E5=B8=88=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/search_teacher_candidate.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/courses/search_teacher_candidate.json.jbuilder b/app/views/courses/search_teacher_candidate.json.jbuilder index 49109b729..af3310fb7 100644 --- a/app/views/courses/search_teacher_candidate.json.jbuilder +++ b/app/views/courses/search_teacher_candidate.json.jbuilder @@ -3,6 +3,7 @@ json.candidates do json.id user.id json.name user.real_name json.nickname user.nickname + json.login user.login json.school_name user.user_extension.school.try(:name) json.school_id user.user_extension.school.try(:id) json.added @course.course_member?(user.id, [1, 2, 3])