|
|
|
@ -242,8 +242,8 @@ class SubjectsController < ApplicationController
|
|
|
|
|
## 云上实验室过滤
|
|
|
|
|
@courses = @courses.where(id: current_laboratory.all_courses)
|
|
|
|
|
|
|
|
|
|
@none_shixun_ids = @subject.shixuns.joins(:shixun_schools)
|
|
|
|
|
.where("school_id != #{current_user.user_extension.try(:school_id).to_i}").pluck(:id)
|
|
|
|
|
@all_shixun_ids = @subject.shixuns.where(use_scope: 0).pluck(:id) +
|
|
|
|
|
@subject.shixuns.joins(:shixun_schools).where("school_id = #{current_user.user_extension.try(:school_id).to_i} and use_scope = 1").pluck(:id)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def send_to_course
|
|
|
|
|