diff --git a/app/controllers/competitions/competition_teams_controller.rb b/app/controllers/competitions/competition_teams_controller.rb index 6d28d6a16..c375ba218 100644 --- a/app/controllers/competitions/competition_teams_controller.rb +++ b/app/controllers/competitions/competition_teams_controller.rb @@ -78,7 +78,7 @@ class Competitions::CompetitionTeamsController < Competitions::BaseController end render_ok - rescue Competitions::CreatePersonalTeamService::Error => ex + rescue ApplicationService::Error => ex render_error(ex.message) end diff --git a/app/models/competition.rb b/app/models/competition.rb index eb1d2a5fa..2789ac628 100644 --- a/app/models/competition.rb +++ b/app/models/competition.rb @@ -47,6 +47,10 @@ class Competition < ApplicationRecord sponsor_schools.map{|sponsor| sponsor.school.name} end + def region_schools_name + region_schools.map{|region| region.school.name} + end + def competition_status if !status com_status = "nearly_published" diff --git a/app/services/competitions/create_personal_team_service.rb b/app/services/competitions/create_personal_team_service.rb index 998a13880..b2976b37a 100644 --- a/app/services/competitions/create_personal_team_service.rb +++ b/app/services/competitions/create_personal_team_service.rb @@ -1,5 +1,4 @@ class Competitions::CreatePersonalTeamService < ApplicationService - Error = Class.new(StandardError) attr_reader :competition, :user diff --git a/app/views/competitions/competitions/common_header.json.jbuilder b/app/views/competitions/competitions/common_header.json.jbuilder index 45e030847..f7860cc35 100644 --- a/app/views/competitions/competitions/common_header.json.jbuilder +++ b/app/views/competitions/competitions/common_header.json.jbuilder @@ -12,6 +12,8 @@ json.published @competition.published? json.nearly_published @competition.published_at.present? json.competition_status @competition.competition_status +json.region_schools @competition.region_schools_name + json.avatar_url url_to_avatar(@competition) json.competition_modules @competition_modules do |com_module|