diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 1e3f105b..44e67e54 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -1063,7 +1063,7 @@ class ShixunsController < ApplicationController end # 超级管理员才能保存 中间层服务器pod信息的配置 - if User.current.admin? + if User.current.admin? || User.current.business? @shixun.shixun_service_configs.each_with_index do |config, index| config.update_attributes(:cpu_limit => params[:cpu_limit][index], :lower_cpu_limit => params[:lower_cpu_limit][index], diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 36616ced..cc93b840 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -282,6 +282,7 @@ module ApplicationHelper :type => mirror.try(:main_type) == "1" ? "main" : "sub"} end end + Rails.logger.info("#########container: #{container.to_json}") return container.to_json end diff --git a/app/services/games_service.rb b/app/services/games_service.rb index 4d58c2c4..8589023a 100644 --- a/app/services/games_service.rb +++ b/app/services/games_service.rb @@ -17,7 +17,6 @@ class GamesService myshixun = Myshixun.min.find(game.myshixun_id) shixun = Shixun.min.find(myshixun.shixun_id) - Rails.logger.info("#########container: #{shixun_container_limit(shixun)}") unless ((myshixun.user_id == current_user.id || current_user.business? || current_user.id == shixun.try(:user_id) || current_user.is_certification_teacher) && (shixun.operable?)) || current_user.admin? Rails.logger.info("######403???") diff --git a/app/views/shixuns/_form.html.erb b/app/views/shixuns/_form.html.erb index bf34df92..337ecee2 100644 --- a/app/views/shixuns/_form.html.erb +++ b/app/views/shixuns/_form.html.erb @@ -39,16 +39,16 @@
简介
- - - - - - - - - - +技术平台
diff --git a/app/views/shixuns/_settings_edit.html.erb b/app/views/shixuns/_settings_edit.html.erb index 39fca96b..6e6fff64 100644 --- a/app/views/shixuns/_settings_edit.html.erb +++ b/app/views/shixuns/_settings_edit.html.erb @@ -35,16 +35,16 @@简介
- - - - - - - - - - +