Merge branch 'dev_aliyun' into educoder

dev_aliyun
cxt 5 years ago
commit f78e7107c4

@ -485,7 +485,7 @@ class WelcomeController < ApplicationController
def _shixun_to_local shixuns def _shixun_to_local shixuns
shixuns.each do |shixun| shixuns.each do |shixun|
if LocalShixun.where(shixun_id: shixun.id).blank? if LocalShixun.where(shixun_id: shixun.id).blank? && !shixun.mirror_repositories.pluck(:type_name).includes?("VNC")
local_shixun = LocalShixun.create!(name: shixun.name, description: shixun.description, user_id: User.current.id, status: 0, local_shixun = LocalShixun.create!(name: shixun.name, description: shixun.description, user_id: User.current.id, status: 0,
trainee: shixun.trainee, webssh: shixun.webssh, multi_webssh: shixun.multi_webssh, trainee: shixun.trainee, webssh: shixun.webssh, multi_webssh: shixun.multi_webssh,

Loading…
Cancel
Save