Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: do not overwrite top_menu site setting in wizard styling step (#17743)

This commit is contained in:
Arpit Jalan 2022-08-02 19:29:34 +05:30 committed by GitHub
parent a799268b66
commit 5cbf0255a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/wizard/builder.rb
View File

@ -144,13 +144,16 @@ class Wizard
updater.update_setting(:base_font, updater.fields[:body_font]) updater.update_setting(:base_font, updater.fields[:body_font])
updater.update_setting(:heading_font, updater.fields[:heading_font]) updater.update_setting(:heading_font, updater.fields[:heading_font])
if updater.fields[:homepage_style] == 'latest' top_menu = SiteSetting.top_menu.split("|")
top_menu = "latest|new|unread|top|categories" if updater.fields[:homepage_style] == 'latest' && top_menu[0] != "latest"
else top_menu.delete("latest")
top_menu = "categories|latest|new|unread|top" top_menu.insert(0, "latest")
elsif updater.fields[:homepage_style] != 'latest' && top_menu[0] != "categories"
top_menu.delete("categories")
top_menu.insert(0, "categories")
updater.update_setting(:desktop_category_page_style, updater.fields[:homepage_style]) updater.update_setting(:desktop_category_page_style, updater.fields[:homepage_style])
end end
updater.update_setting(:top_menu, top_menu) updater.update_setting(:top_menu, top_menu.join("|"))
scheme_name = ( scheme_name = (
(updater.fields[:color_scheme] || "") || (updater.fields[:color_scheme] || "") ||

28
spec/lib/wizard/step_updater_spec.rb
View File

@ -217,6 +217,7 @@ RSpec.describe Wizard::StepUpdater do
context "homepage style" do context "homepage style" do
it "updates the fields correctly" do it "updates the fields correctly" do
SiteSetting.top_menu = "latest|categories|unread|top"
updater = wizard.create_updater('styling', updater = wizard.create_updater('styling',
body_font: 'arial', body_font: 'arial',
heading_font: 'arial', heading_font: 'arial',
@ -226,9 +227,10 @@ RSpec.describe Wizard::StepUpdater do
expect(updater).to be_success expect(updater).to be_success
expect(wizard.completed_steps?('styling')).to eq(true) expect(wizard.completed_steps?('styling')).to eq(true)
expect(SiteSetting.top_menu).to eq('categories|latest|new|unread|top') expect(SiteSetting.top_menu).to eq('categories|latest|unread|top')
expect(SiteSetting.desktop_category_page_style).to eq('categories_and_top_topics') expect(SiteSetting.desktop_category_page_style).to eq('categories_and_top_topics')
SiteSetting.top_menu = "categories|latest|new|top"
updater = wizard.create_updater('styling', updater = wizard.create_updater('styling',
body_font: 'arial', body_font: 'arial',
heading_font: 'arial', heading_font: 'arial',
@ -236,7 +238,29 @@ RSpec.describe Wizard::StepUpdater do
) )
updater.update updater.update
expect(updater).to be_success expect(updater).to be_success
expect(SiteSetting.top_menu).to eq('latest|new|unread|top|categories') expect(SiteSetting.top_menu).to eq('latest|categories|new|top')
end
it "does not overwrite top_menu site setting" do
SiteSetting.top_menu = "latest|unread|unseen|categories"
updater = wizard.create_updater('styling',
body_font: 'arial',
heading_font: 'arial',
homepage_style: "latest"
)
updater.update
expect(updater).to be_success
expect(SiteSetting.top_menu).to eq('latest|unread|unseen|categories')
SiteSetting.top_menu = "categories|new|latest"
updater = wizard.create_updater('styling',
body_font: 'arial',
heading_font: 'arial',
homepage_style: "categories_and_top_topics"
)
updater.update
expect(updater).to be_success
expect(SiteSetting.top_menu).to eq('categories|new|latest')
end end
end end
end end