Merge remote-tracking branch 'origin/develop' into develop

app/controllers/shixuns_controller.rb

@@ -974,8 +974,14 @@ class ShixunsController < ApplicationController
 
 		end
 
-		@course_count = course_ids.length
-		@courses = Course.where(:id => course_ids).page(page).per(limit)
+		@courses = Course.where(:id => course_ids)
+		## 云上实验室过滤
+		unless current_laboratory.main_site?
+			@courses = @courses.where(laboratory_id: current_laboratory.id )
+		end
+
+		@course_count = @courses.count
+		@courses = @courses.page(page).per(limit)
 	end
 
 	# 将实训发送到课程

app/controllers/subjects_controller.rb

@@ -204,6 +204,10 @@ class SubjectsController < ApplicationController
                                       WHERE m.course_id = c.id AND m.role in (1,2,3)
                                       AND m.user_id=#{current_user.id} AND c.is_delete = 0 AND c.is_end = 0").map(&:id)
     @courses = Course.where(id: course_ids)
+    ## 云上实验室过滤
+    unless current_laboratory.main_site?
+      @courses = @courses.where(laboratory_id: current_laboratory.id )
+    end
     @none_shixun_ids = ShixunSchool.where("school_id != #{current_user.user_extension.try(:school_id).to_i}").pluck(:shixun_id)
   end
 

app/models/laboratory.rb

@@ -9,10 +9,10 @@ class Laboratory < ApplicationRecord
   has_many :portal_images, dependent: :destroy
 
   has_many :laboratory_shixuns, dependent: :destroy
-  has_many :shixuns, through: :laboratory_shixuns, source: :shixun
+  # has_many :shixuns, through: :laboratory_shixuns, source: :shixun
 
   has_many :laboratory_subjects, dependent: :destroy
-  has_many :subjects, through: :laboratory_subjects, source: :subject
+  # has_many :subjects, through: :laboratory_subjects, source: :subject
 
   has_many :courses, dependent: :destroy
   has_many :competitions, dependent: :destroy

app/services/shixun_search_service.rb

@@ -36,8 +36,13 @@ class ShixunSearchService < ApplicationService
       @shixuns = @shixuns.where(trainee: params[:diff])
     end
 
-    laboratory = Laboratory.find_by_subdomain(subdomain)
-    @shixuns = @shixuns.where(id: laboratory.shixuns) if laboratory
+    ## 云上实验室过滤
+    unless current_laboratory.main_site?
+      @shixuns = @shixuns.joins(:laboratory_shixuns).where(laboratory_shixuns: { laboratory_id: current_laboratory.id })
+    end
+
+    # laboratory = Laboratory.find_by_subdomain(subdomain)
+    # @shixuns = @shixuns.where(id: laboratory.shixuns) if laboratory
 
     Shixun.search(keyword, search_options)
   end

app/services/subject_search_service.rb

@@ -18,8 +18,13 @@ class SubjectSearchService < ApplicationService
       @subjects = Subject.visible.unhidden
     end
 
-    laboratory = Laboratory.find_by_subdomain(subdomain)
-    @subjects = @subjects.where(id: laboratory.subjects) if laboratory
+    # laboratory = Laboratory.find_by_subdomain(subdomain)
+    # @subjects = @subjects.where(id: laboratory.subjects) if laboratory
+
+    ## 云上实验室过滤
+    unless current_laboratory.main_site?
+      subjects = subjects.joins(:laboratory_subjects).where(laboratory_subjects: { laboratory_id: current_laboratory.id })
+    end
 
     Subject.search(keyword, search_options)
   end