diff --git a/app/controllers/competitions/competitions_controller.rb b/app/controllers/competitions/competitions_controller.rb index 829251c38..72f53d1e2 100644 --- a/app/controllers/competitions/competitions_controller.rb +++ b/app/controllers/competitions/competitions_controller.rb @@ -143,7 +143,7 @@ class Competitions::CompetitionsController < Competitions::BaseController } end else - @records = @records.includes(:team_members, competition_prize_users: :competition_prize, user: :user_extension).limit(@competition.awards_count) + @records = @records.includes(:team_members, competition_prize_users: :competition_prize, user: :user_extension).limit(@competition.charts_count) end end diff --git a/app/models/competition.rb b/app/models/competition.rb index aa87e9ef5..0ffd1c7a5 100644 --- a/app/models/competition.rb +++ b/app/models/competition.rb @@ -149,9 +149,9 @@ class Competition < ApplicationRecord competition_stages.map(&:max_end_time).max end - # def awards_count - # competition_awards.pluck(:num)&.sum > 0 ? competition_awards.pluck(:num)&.sum : 20 - # end + def charts_count + competition_awards.pluck(:num)&.sum > 0 ? competition_awards.pluck(:num)&.sum : awards_count + end def manager?(user) user && competition_managers.exists?(user_id: user.id)