From e4fec1f0c239977459951150f7704bc923a8faa7 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 24 Oct 2019 18:26:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/competition_module.rb | 2 +- app/models/competition_stage.rb | 1 + .../competitions/competition_modules/show.json.jbuilder | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/models/competition_module.rb b/app/models/competition_module.rb index 3b1bfddda..3fdab6b37 100644 --- a/app/models/competition_module.rb +++ b/app/models/competition_module.rb @@ -3,7 +3,7 @@ class CompetitionModule < ApplicationRecord belongs_to :competition - has_many :competition_module_md_contents, dependent: :destroy + has_one :competition_module_md_content, dependent: :destroy def module_url result_url = url.present? ? url : case module_type diff --git a/app/models/competition_stage.rb b/app/models/competition_stage.rb index dec777b39..ca15733d9 100644 --- a/app/models/competition_stage.rb +++ b/app/models/competition_stage.rb @@ -5,6 +5,7 @@ class CompetitionStage < ApplicationRecord has_many :competition_entries, dependent: :destroy has_many :competition_scores, dependent: :destroy + has_one :competition_module_md_content, dependent: :destroy has_one :chart_rule, dependent: :destroy def min_start_time diff --git a/app/views/competitions/competition_modules/show.json.jbuilder b/app/views/competitions/competition_modules/show.json.jbuilder index fcb860101..116934ee8 100644 --- a/app/views/competitions/competition_modules/show.json.jbuilder +++ b/app/views/competitions/competition_modules/show.json.jbuilder @@ -1,7 +1,8 @@ json.extract! @module, :id, :name, :position, :url -mds = @module.competition_module_md_contents -json.md_contents mds.each do |md| +md = @module.competition_module_md_content +if md.present? + json.md_id md.id json.md_name md.name json.md_content md.content json.competition_stage_id md.competition_stage_id