From d7ff92e0ed990fda2c9a74b8db7ad95aa04d5923 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 12 Mar 2020 19:13:26 +0800
Subject: [PATCH 1/3] =?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, 2 insertions(+)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index a102f92de..7c4b20c86 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -560,6 +560,8 @@ class CoursesController < ApplicationController
             member = CourseMember.create(course_id: @course.id, graduation_group_id: @graduation_group_id, user_id: user_id, role: role, is_active: is_active)
 
             member.teacher_course_groups << TeacherCourseGroup.new(course_group_id: @course_group_id, user_id: user_id, course_id: @course.id) if @course_group_id != 0
+
+            @course.course_messages.join_course_requests.unhandled.where(course_message_id: user_id).update!(status: :PASSED)
           end
         end
         TeacherInviteJoinCourseNotifyJob.perform_later(current_user.id, @course.id, role, teacher_ids) if teacher_ids.present?

From 98c2882ab18ae88070b746d004a4d671fe67b65a Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 12 Mar 2020 19:21:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=80=81=E5=B8=88/?=
 =?UTF-8?q?=E5=8A=A9=E6=95=99=E6=97=B6=E5=B0=86=E8=AF=A5=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84=E7=94=B3=E8=AF=B7=E8=AE=B0=E5=BD=95=E7=BD=AE=E4=B8=BA?=
 =?UTF-8?q?=E5=B7=B2=E5=A4=84=E7=90=86?=
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 7c4b20c86..68211d034 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -561,7 +561,7 @@ class CoursesController < ApplicationController
 
             member.teacher_course_groups << TeacherCourseGroup.new(course_group_id: @course_group_id, user_id: user_id, course_id: @course.id) if @course_group_id != 0
 
-            @course.course_messages.join_course_requests.unhandled.where(course_message_id: user_id).update!(status: :PASSED)
+            @course.course_messages.join_course_requests.unhandled.where(course_message_id: user_id).update_all(status: :PASSED)
           end
         end
         TeacherInviteJoinCourseNotifyJob.perform_later(current_user.id, @course.id, role, teacher_ids) if teacher_ids.present?

From 2a208badfe7eb917c5c4916d65a9b35e18cc9e0c Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 12 Mar 2020 19:27:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9A=84?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=8E=BB=E6=8E=89=E5=A4=96=E9=93=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 427545716..362523a7d 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -42,6 +42,10 @@ class FilesController < ApplicationController
     @unpublish_count = @total_count - @publish_count
     @attachments = @attachments.by_keywords(params[:search])
 
+    if params[:no_link]
+      @attachments = @attachments.where(link: nil)
+    end
+
     @attachments = @attachments.page(@page).per(@page_size)
   end