A platform for community discussion. Free, open, simple.
FIX: Report effective welcome banner state for themes without overrides (#42451)
Gabriel Grubbaf9f1540323d6
diff --git a/app/controllers/admin/config/welcome_banner_controller.rb b/app/controllers/admin/config/welcome_banner_controller.rbindex 5f36e99b0cf..1a2529526d7 100644--- a/app/controllers/admin/config/welcome_banner_controller.rb+++ b/app/controllers/admin/config/welcome_banner_controller.rb@@ -13,7 +13,7 @@ class Admin::Config::WelcomeBannerController < Admin::AdminControllerthemes_data =themes.map do |theme|setting = theme.theme_site_settings.find { |s| s.name == "enable_welcome_banner" }- value = setting&.setting_rb_value || false+ value = setting ? setting.setting_rb_value : SiteSetting.defaults[:enable_welcome_banner]{ id: theme.id, name: theme.name, enable_welcome_banner: value }enddiff --git a/spec/requests/admin/config/welcome_banner_controller_spec.rb b/spec/requests/admin/config/welcome_banner_controller_spec.rbindex 2c7231116ca..c9aeee96452 100644--- a/spec/requests/admin/config/welcome_banner_controller_spec.rb+++ b/spec/requests/admin/config/welcome_banner_controller_spec.rb@@ -54,7 +54,14 @@ RSpec.describe Admin::Config::WelcomeBannerController doexpect(theme_data["enable_welcome_banner"]).to eq(true)end- it "returns false for enable_welcome_banner when setting is not present" do+ it "returns false when the theme explicitly disables the welcome banner" do+ Fabricate(+ :theme_site_setting,+ theme: user_selectable_theme,+ name: "enable_welcome_banner",+ value: false,+ )+get "/admin/config/welcome-banner/themes-with-setting.json"expect(response.status).to eq(200)@@ -62,6 +69,15 @@ RSpec.describe Admin::Config::WelcomeBannerController dotheme_data = response.parsed_body["themes"].find { |t| t["id"] == user_selectable_theme.id }expect(theme_data["enable_welcome_banner"]).to eq(false)end++ it "returns the effective default for enable_welcome_banner when setting is not present" do+ get "/admin/config/welcome-banner/themes-with-setting.json"++ expect(response.status).to eq(200)++ theme_data = response.parsed_body["themes"].find { |t| t["id"] == user_selectable_theme.id }+ expect(theme_data["enable_welcome_banner"]).to eq(true)+ endendcontext "when logged in as a moderator" do