ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Thank you, Officer Murphy

rebase/4.0.0rc2
David Yip 2018-01-09 20:16:31 -06:00
parent 514db316f7
commit 395e64e858
No known key found for this signature in database
GPG Key ID: 7DA0036508FCC0CC
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/settings/flavours_controller.rb
View File

@ -1,13 +1,12 @@
# frozen_string_literal: true # frozen_string_literal: true
class Settings::FlavoursController < Settings::BaseController class Settings::FlavoursController < Settings::BaseController
def index def index
redirect_to action: 'show', flavour: current_flavour redirect_to action: 'show', flavour: current_flavour
end end
def show 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 redirect_to action: 'show', flavour: current_flavour
end end
@ -28,7 +27,6 @@ class Settings::FlavoursController < Settings::BaseController
def user_settings_params def user_settings_params
{ setting_flavour: params.require(:flavour), { setting_flavour: params.require(:flavour),
setting_skin: params.dig(:user, :setting_skin) setting_skin: params.dig(:user, :setting_skin) }.with_indifferent_access
}.with_indifferent_access
end end
end end

1
spec/controllers/settings/flavours_controller_spec.rb
View File

@ -1,3 +1,4 @@
# frozen_string_literal: true
require 'rails_helper' require 'rails_helper'
RSpec.describe Settings::FlavoursController, type: :controller do RSpec.describe Settings::FlavoursController, type: :controller do