FIX: Do not reset sidebar defaults in wizard (#27156)

We removed the option to enable/disable the sidebar in the wizard in
https://github.com/discourse/discourse/pull/26926, but these lines of
code were resetting it quietly to `header_dropdown`.
This commit is contained in:
Penar Musaraj
2024-05-23 16:45:47 -04:00
committed by GitHub
parent 755f8de6d4
commit f9192835a7
3 changed files with 0 additions and 16 deletions

View File

@ -94,7 +94,6 @@ class Wizard
updater.update_setting(:invite_only, updater.fields[:invite_only])
updater.update_setting(:must_approve_users, updater.fields[:must_approve_users])
updater.update_setting(:chat_enabled, updater.fields[:chat_enabled]) if defined?(::Chat)
updater.update_setting(:navigation_menu, updater.fields[:enable_sidebar])
end
end

View File

@ -37,17 +37,6 @@ class Wizard
value = Upload.get_from_url(value) || ""
end
if id == :navigation_menu
value =
(
if value.to_s == "true"
NavigationMenuSiteSetting::SIDEBAR
else
NavigationMenuSiteSetting::HEADER_DROPDOWN
end
)
end
SiteSetting.set_and_log(id, value, @current_user) if SiteSetting.get(id) != value
end