From 395e64e8580e8232b817b6278ea28a7c523bd6f7 Mon Sep 17 00:00:00 2001 From: David Yip Date: Tue, 9 Jan 2018 20:16:31 -0600 Subject: [PATCH] Thank you, Officer Murphy --- app/controllers/settings/flavours_controller.rb | 6 ++---- spec/controllers/settings/flavours_controller_spec.rb | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/settings/flavours_controller.rb b/app/controllers/settings/flavours_controller.rb index a2d2c9deee3..6343877153b 100644 --- a/app/controllers/settings/flavours_controller.rb +++ b/app/controllers/settings/flavours_controller.rb @@ -1,13 +1,12 @@ # frozen_string_literal: true class Settings::FlavoursController < Settings::BaseController - def index redirect_to action: 'show', flavour: current_flavour end def show - unless Themes.instance.flavours.include?(params[:flavour]) or params[:flavour] == current_flavour + unless Themes.instance.flavours.include?(params[:flavour]) || (params[:flavour] == current_flavour) redirect_to action: 'show', flavour: current_flavour end @@ -28,7 +27,6 @@ class Settings::FlavoursController < Settings::BaseController def user_settings_params { setting_flavour: params.require(:flavour), - setting_skin: params.dig(:user, :setting_skin) - }.with_indifferent_access + setting_skin: params.dig(:user, :setting_skin) }.with_indifferent_access end end diff --git a/spec/controllers/settings/flavours_controller_spec.rb b/spec/controllers/settings/flavours_controller_spec.rb index 51322c5bb53..f89bde1f96f 100644 --- a/spec/controllers/settings/flavours_controller_spec.rb +++ b/spec/controllers/settings/flavours_controller_spec.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'rails_helper' RSpec.describe Settings::FlavoursController, type: :controller do