From d9044581fb878b32ac5d083b8dc7cb061f0d9a37 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 15 Nov 2019 15:21:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9A=94=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users/courses_controller.rb | 2 ++ app/controllers/users/shixuns_controller.rb | 8 ++++++++ app/controllers/users/subjects_controller.rb | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/app/controllers/users/courses_controller.rb b/app/controllers/users/courses_controller.rb index 2c5e29d2b..4198e17ba 100644 --- a/app/controllers/users/courses_controller.rb +++ b/app/controllers/users/courses_controller.rb @@ -2,6 +2,8 @@ class Users::CoursesController < Users::BaseController def index courses = Users::CourseService.new(observed_user, query_params).call + courses = courses.where(laboratory_id: current_laboratory.id) + @count = courses.count @courses = paginate(courses.includes(teacher: { user_extension: :school }), special: observed_user.is_teacher?) end diff --git a/app/controllers/users/shixuns_controller.rb b/app/controllers/users/shixuns_controller.rb index 5d8da9684..3758fbe19 100644 --- a/app/controllers/users/shixuns_controller.rb +++ b/app/controllers/users/shixuns_controller.rb @@ -2,6 +2,14 @@ class Users::ShixunsController < Users::BaseController def index shixuns = Users::ShixunService.new(observed_user, query_params).call + ## 云上实验室过滤 + if current_laboratory.main_site? + not_shixun_ids = Shixun.joins(:laboratory_shixuns).where("laboratory_shixuns.laboratory_id != #{current_laboratory.id}") + @shixuns = @shixuns.where.not(id: not_shixun_ids) + else + @shixuns = @shixuns.joins(:laboratory_shixuns).where(laboratory_shixuns: { laboratory_id: current_laboratory.id }) + end + @count = shixuns.count @shixuns = paginate(shixuns.includes(:first_tag_repertoire), special: observed_user.is_teacher?) diff --git a/app/controllers/users/subjects_controller.rb b/app/controllers/users/subjects_controller.rb index 2f8f308df..59ad86859 100644 --- a/app/controllers/users/subjects_controller.rb +++ b/app/controllers/users/subjects_controller.rb @@ -2,6 +2,14 @@ class Users::SubjectsController < Users::BaseController def index subjects = Users::SubjectService.new(observed_user, query_params).call + ## 云上实验室过滤 + if current_laboratory.main_site? + not_subject_ids = Subject.joins(:laboratory_subjects).where("laboratory_subjects.laboratory_id != #{current_laboratory.id}") + @subjects = @subjects.where.not(id: not_subject_ids) + else + @subjects = @subjects.joins(:laboratory_subjects).where(laboratory_subjects: { laboratory_id: current_laboratory.id }) + end + @count = subjects.count @subjects = paginate(subjects.includes(:user, :repertoire), special: observed_user.is_teacher?) end