Thank you, Officer Murphy
This commit is contained in:
		
							parent
							
								
									514db316f7
								
							
						
					
					
						commit
						395e64e858
					
				
					 2 changed files with 3 additions and 4 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,3 +1,4 @@
 | 
			
		|||
# frozen_string_literal: true
 | 
			
		||||
require 'rails_helper'
 | 
			
		||||
 | 
			
		||||
RSpec.describe Settings::FlavoursController, type: :controller do
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue