diff --git a/db/migrate/20191024090740_migrate_competition_chart_rules.rb b/db/migrate/20191024090740_migrate_competition_chart_rules.rb index ed1dd56e9..bff749e23 100644 --- a/db/migrate/20191024090740_migrate_competition_chart_rules.rb +++ b/db/migrate/20191024090740_migrate_competition_chart_rules.rb @@ -1,14 +1,5 @@ class MigrateCompetitionChartRules < ActiveRecord::Migration[5.2] def change add_column :competition_module_md_contents, :competition_stage_id, :integer, default: 0 - - ChartRule.all.each do |rule| - if rule.competition - com_module = rule.competition.competition_modules.find_by(module_type: "chart") - if com_module - CompetitionModuleMdContent.create!(content: rule.content, competition_module_id: com_module.id, competition_stage_id: rule.competition_stage_id ? rule.competition_stage_id : 0) - end - end - end end end diff --git a/db/migrate/20191026110116_migrate_chart_rule.rb b/db/migrate/20191026110116_migrate_chart_rule.rb new file mode 100644 index 000000000..05331e90d --- /dev/null +++ b/db/migrate/20191026110116_migrate_chart_rule.rb @@ -0,0 +1,12 @@ +class MigrateChartRule < ActiveRecord::Migration[5.2] + def change + ChartRule.all.each do |rule| + if rule.competition + com_module = rule.competition.competition_modules.find_by(module_type: "chart") + if com_module && !com_module.competition_module_md_contents.exists?(competition_stage_id: rule.competition_stage_id ? rule.competition_stage_id : 0) + CompetitionModuleMdContent.create!(content: rule.content, competition_module_id: com_module.id, competition_stage_id: rule.competition_stage_id ? rule.competition_stage_id : 0) + end + end + end + end +end diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js index 03b04d1b5..91f75c954 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js @@ -320,20 +320,23 @@ class CompetitionContents extends Component{ line-height: 63px; width: 300px; height: 96px; - display: inline-block; + overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } .ant-table-tbody > tr > td:nth-last-child(3){ - line-height: 63px; - width: 305px; - height: 96px; - display: inline-block; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } + line-height: 63px; + width: 300px; + height: 96px; + display: inline-block; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + .ant-table-tbody>tr>td, .ant-table-thead>tr>th { + padding: 15px; + } ` }