diff --git a/app/controllers/admins/competition_settings_controller.rb b/app/controllers/admins/competition_settings_controller.rb index 390ad17e8..25d590cc1 100644 --- a/app/controllers/admins/competition_settings_controller.rb +++ b/app/controllers/admins/competition_settings_controller.rb @@ -1,5 +1,5 @@ class Admins::CompetitionSettingsController < Admins::BaseController - def show + def index @competition = current_competition end diff --git a/app/services/competitions/create_personal_team_service.rb b/app/services/competitions/create_personal_team_service.rb index 12b595cae..7f2123ce7 100644 --- a/app/services/competitions/create_personal_team_service.rb +++ b/app/services/competitions/create_personal_team_service.rb @@ -20,7 +20,7 @@ class Competitions::CreatePersonalTeamService < ApplicationService raise Error, '您已报名该竞赛' if enrolled && multiple_limited ActiveRecord::Base.transaction do - team = competition.competition_teams.create!(name: user.show_name, user_id: user.id) + team = competition.competition_teams.create!(name: user.real_name, user_id: user.id) team.team_members.create!(competition_id: competition, user_id: user.id, role: 1, is_teacher: is_teacher) end end diff --git a/app/views/admins/competition_settings/show.html.erb b/app/views/admins/competition_settings/index.html.erb similarity index 90% rename from app/views/admins/competition_settings/show.html.erb rename to app/views/admins/competition_settings/index.html.erb index 6272687e4..4f53cb5d3 100644 --- a/app/views/admins/competition_settings/show.html.erb +++ b/app/views/admins/competition_settings/index.html.erb @@ -10,7 +10,9 @@ 基础设置
+
+
diff --git a/config/routes.rb b/config/routes.rb index 63450239c..9be68d174 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -787,7 +787,7 @@ Rails.application.routes.draw do resources :competitions, only: [:index, :show, :update] do resources :competition_modules, only: [:index, :show, :update] resource :competition_staff - resources :competition_teams, only: [:index, :show] do + resources :competition_teams, only: [:index, :show, :create, :update] do post :join, on: :collection post :leave, on: :member get :course_detail, on: :member