luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 13:17:13 +00:00
Code Issues Projects Releases Wiki Activity

Allow for user object to be empty. Fixes #317.

Browse source 
If a flavour has only one skin, the skin selector will be omitted.  This
omits the user[setting_skin] field, and because that's the only
user[...] field on the page, the entire user object will not be present
in the request handler's params object.

This commit accounts for that scenario by avoiding params.require(:user)
and instead picking out what we need from the params hash.
This commit is contained in:
David Yip 2018-01-09 20:09:00 -06:00
parent 3ce1385b25
commit 6fcb870d96
No known key found for this signature in database
GPG key ID: 7DA0036508FCC0CC
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/settings/flavours_controller.rb
View file

@ -16,7 +16,7 @@ class Settings::FlavoursController < Settings::BaseController
end end
def update def update
user_settings.update(user_settings_params(params[:flavour]).to_h) user_settings.update(user_settings_params(params[:flavour]))
redirect_to action: 'show', flavour: params[:flavour] redirect_to action: 'show', flavour: params[:flavour]
end end
@ -27,9 +27,8 @@ class Settings::FlavoursController < Settings::BaseController
end end
def user_settings_params(flavour) def user_settings_params(flavour)
params.require(:user).merge({ setting_flavour: flavour }).permit( { setting_flavour: params.require(:flavour),
:setting_flavour, setting_skin: params.dig(:user, :setting_skin)
:setting_skin }.with_indifferent_access
)
end end
end end