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

app/controllers/application_controller.rb

@@ -465,9 +465,9 @@ class ApplicationController < ActionController::Base
 	# 实训主类别列表，自带描述
 	def shixun_main_type
 		list = []
-		mirrors = MirrorRepository.select([:id, :type_name, :description]).published_main_mirror
+		mirrors = MirrorRepository.select([:id, :type_name, :description, :name]).published_main_mirror
 		mirrors.try(:each) do |mirror|
-			list << {id: mirror.id, type_name: mirror.type_name, description: mirror.try(:description)}
+			list << {id: mirror.id, type_name: mirror.type_name, description: mirror.try(:description), mirror_name: mirror.name}
 		end
 		list
 	end
@@ -475,9 +475,9 @@ class ApplicationController < ActionController::Base
 	# 小类别列表
 	def shixun_small_type
 		list = []
-		mirrors = MirrorRepository.select([:id, :type_name, :description]).published_small_mirror
+		mirrors = MirrorRepository.select([:id, :type_name, :description, :name]).published_small_mirror
 		mirrors.try(:each) do |mirror|
-			list << {id: mirror.id, type_name: mirror.type_name, description: mirror.description}
+			list << {id: mirror.id, type_name: mirror.type_name, description: mirror.description, mirror_name: mirror.name}
 		end
 		list
 	end

app/controllers/shixuns_controller.rb

@@ -400,13 +400,14 @@ class ShixunsController < ApplicationController
 				@shixun.shixun_info.update_attributes(shixun_info_params)
 				# 镜像变动
 				@shixun.shixun_mirror_repositories.where.not(mirror_repository_id: old_mirror_ids).destroy_all
-				@shixun.shixun_mirror_repositories.create!(new_mirror_id)
+				@shixun.shixun_mirror_repositories.create!(new_mirror_id) if new_mirror_id.present?
 				# 镜像变动要更换服务配置
 				@shixun.shixun_service_configs.where.not(mirror_repository_id: old_mirror_ids).destroy_all
-				@shixun.shixun_service_configs.create!(service_create_params)
+				@shixun.shixun_service_configs.create!(service_create_params) if service_create_params.present?
 				service_update_params&.map do |service|
 					smr = @shixun.shixun_service_configs.find_by(mirror_repository_id: service[:mirror_repository_id])
-					smr.update_attributes(service)
+					logger.info("########smr: #{smr}")
+					smr.update_attributes(service) if smr.present?
 				end
 				# 添加第二仓库（管理员权限）
 				if params[:is_secret_repository]

db/migrate/20191216071931_modify_task_pass_for_shixuns.rb

@@ -0,0 +1,5 @@
+class ModifyTaskPassForShixuns < ActiveRecord::Migration[5.2]
+  def change
+    change_column :shixuns, :task_pass, :boolean, :default => true
+  end
+end