Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/homework_commons_controller.rb

@@ -1046,7 +1046,7 @@ class HomeworkCommonsController < ApplicationController
                                          course_module_id: course_module.id, position: course_module.course_second_categories.count + 1)
 
         # 去掉不对当前用户的单位公开的实训，已发布的实训
-        stage.shixuns.where.not(shixuns: {id: none_shixun_ids}).unhidden.each do |shixun|
+        stage.shixuns.no_jupyter.where.not(shixuns: {id: none_shixun_ids}).unhidden.each do |shixun|
           homework = HomeworksService.new.create_homework shixun, @course, category, current_user
           @homework_ids << homework.id
           CreateStudentWorkJob.perform_later(homework.id)

app/controllers/subjects_controller.rb

@@ -255,7 +255,7 @@ class SubjectsController < ApplicationController
             CourseSecondCategory.create!(name: stage.name, course_id: @course.id, category_type: "shixun_homework",
                                          course_module_id: course_module.id, position: course_module.course_second_categories.count + 1)
 
-        stage.shixuns.where(id: params[:shixun_ids], status: 2).each do |shixun|
+        stage.shixuns.no_jupyter.where(id: params[:shixun_ids], status: 2).each do |shixun|
           homework = HomeworksService.new.create_homework shixun, @course, category, current_user
           homework_ids << homework.id
         end

app/models/course.rb

@@ -92,6 +92,7 @@ class Course < ApplicationRecord
     where("name LIKE ?", "%#{keywords.split(" ").join('|')}%") unless keywords.blank?
   }
   scope :started,  -> { where("start_date is null or start_date <= '#{Date.today}'") }
+  scope :no_jupyter,  -> { where(is_jupyter: false) }
 
   # acts_as_taggable