From 88f16d455263d7b0a293b58f10d31cc346e5facc Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 15 Oct 2019 14:23:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=80=81=E5=B8=88=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E4=B8=BA=E5=AD=A6=E7=94=9F=E8=BA=AB=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 2804b6d9c..595e76d4a 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -1133,7 +1133,7 @@ class CoursesController < ApplicationController def top_banner @user = current_user - @switch_student = Course::BUSINESS < @user_course_identity < Course::STUDENT + @switch_student = Course::BUSINESS < @user_course_identity && @user_course_identity < Course::STUDENT @is_student = @user_course_identity == Course::STUDENT @course.increment!(:visits) end From 416389296da3be223704102f5a860230d8c41125 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 15 Oct 2019 14:24:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=80=81=E5=B8=88=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E4=B8=BA=E5=AD=A6=E7=94=9F=E8=BA=AB=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 595e76d4a..4a0bc7a71 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -686,7 +686,7 @@ class CoursesController < ApplicationController course_student.update_attributes!(is_active: 1) else # 学生身份不存在则创建 - CourseMember.create!(user_id: current_user.id, role: %i[STUDENT], course_id: @course.id) + CourseMember.create!(user_id: current_user.id, role: 4, course_id: @course.id) CourseAddStudentCreateWorksJob.perform_later(@course.id, [current_user.id]) end course_member.update_attributes!(is_active: 0) From 125e4dede4687bd91a2a04d36be15998c57cacbe Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 15 Oct 2019 14:27:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 4a0bc7a71..0b3e35519 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -682,6 +682,7 @@ class CoursesController < ApplicationController tip_exception("切换失败") if course_member.STUDENT? course_student = CourseMember.find_by(user_id: current_user.id, role: %i[STUDENT], course_id: @course.id) + course_member.update_attributes!(is_active: 0) if course_student course_student.update_attributes!(is_active: 1) else @@ -689,7 +690,6 @@ class CoursesController < ApplicationController CourseMember.create!(user_id: current_user.id, role: 4, course_id: @course.id) CourseAddStudentCreateWorksJob.perform_later(@course.id, [current_user.id]) end - course_member.update_attributes!(is_active: 0) normal_status(0, "切换成功") rescue => e uid_logger_error("switch_to_student error: #{e.message}") From 2cedb6da301cc8922c04b9d25a183ef96ee95898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 15 Oct 2019 14:31:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/Resource/index.js | 3 ++ .../courses/coursesPublic/SelectSetting.js | 45 +++++++++++++------ 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js index 3423d87f0..d61dec15b 100644 --- a/public/react/src/modules/courses/Resource/index.js +++ b/public/react/src/modules/courses/Resource/index.js @@ -745,6 +745,7 @@ class Fileslists extends Component{ {/*选择资源*/} {shixunmodal&&shixunmodal===true?100){ @@ -241,10 +255,18 @@ class Selectsetting extends Component{ fileList:[] }) } - - } + onChangepublic=(e)=>{ + this.setState({ + is_public:e.target.checked + }) + } + RadioonChange=(e)=>{ + this.setState({ + Radiovalue: e.target.value, + }); + } render(){ let {datatime,description,datalist}=this.state; @@ -479,16 +501,6 @@ class Selectsetting extends Component{ margin-top:10px; } `} - - {this.props.course_is_public===true?
- 公开： - 选中，所有用户可见，否则课堂成员可见 - -
:""} - - - - - + {this.props.course_is_public===true?
+ 公开： + 选中，所有用户可见，否则课堂成员可见 + +
:""}