diff --git a/lib/wizard/builder.rb b/lib/wizard/builder.rb index 8711f855c69..35aa5721d49 100644 --- a/lib/wizard/builder.rb +++ b/lib/wizard/builder.rb @@ -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 diff --git a/lib/wizard/step_updater.rb b/lib/wizard/step_updater.rb index 078a208b029..80c9c31d38d 100644 --- a/lib/wizard/step_updater.rb +++ b/lib/wizard/step_updater.rb @@ -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 diff --git a/spec/lib/wizard/step_updater_spec.rb b/spec/lib/wizard/step_updater_spec.rb index 12ff26d7201..177865354f5 100644 --- a/spec/lib/wizard/step_updater_spec.rb +++ b/spec/lib/wizard/step_updater_spec.rb @@ -54,14 +54,12 @@ RSpec.describe Wizard::StepUpdater do login_required: false, invite_only: false, must_approve_users: false, - enable_sidebar: false, ) updater.update expect(updater.success?).to eq(true) expect(SiteSetting.login_required?).to eq(false) expect(SiteSetting.invite_only?).to eq(false) expect(SiteSetting.must_approve_users?).to eq(false) - expect(SiteSetting.navigation_menu).to eq(NavigationMenuSiteSetting::HEADER_DROPDOWN) expect(wizard.completed_steps?("privacy")).to eq(true) end @@ -72,14 +70,12 @@ RSpec.describe Wizard::StepUpdater do login_required: true, invite_only: true, must_approve_users: true, - enable_sidebar: true, ) updater.update expect(updater.success?).to eq(true) expect(SiteSetting.login_required?).to eq(true) expect(SiteSetting.invite_only?).to eq(true) expect(SiteSetting.must_approve_users?).to eq(true) - expect(SiteSetting.navigation_menu).to eq(NavigationMenuSiteSetting::SIDEBAR) expect(wizard.completed_steps?("privacy")).to eq(true) end end