IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Wizard was creating duplicate Light theme if Light was selected (#9464)

Browse Source
This commit is contained in:
Mark VanLandingham
2020-04-20 08:31:43 -05:00
committed by GitHub
parent 7876ee2d67
commit 0a3cc22cec
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/wizard/builder.rb
View File

@@ -181,11 +181,16 @@ class Wizard
next unless scheme_name.present? && ColorScheme.is_base?(scheme_name) next unless scheme_name.present? && ColorScheme.is_base?(scheme_name)
name = I18n.t("color_schemes.#{scheme_name.downcase.gsub(' ', '_')}_theme_name") name = I18n.t("color_schemes.#{scheme_name.downcase.gsub(' ', '_')}_theme_name")
theme = nil theme = nil
scheme = ColorScheme.find_by(base_scheme_id: scheme_name, via_wizard: true) scheme = ColorScheme.find_by(base_scheme_id: scheme_name, via_wizard: true)
is_light_theme = (scheme_name == ColorScheme::LIGHT_THEME_ID)
scheme ||= ColorScheme.create_from_base(name: name, via_wizard: true, base_scheme_id: scheme_name) scheme ||= ColorScheme.create_from_base(name: name, via_wizard: true, base_scheme_id: scheme_name)
themes = Theme.where(color_scheme_id: scheme.id).order(:id).to_a themes = Theme.where(color_scheme_id: scheme.id).order(:id).to_a
if is_light_theme
themes = (themes || []).concat(Theme.where(color_scheme_id: nil).order(:id).to_a)
themes.sort_by(&:id)
end
theme = themes.find(&:default?) theme = themes.find(&:default?)
theme ||= themes.first theme ||= themes.first