Use expect
for nested params in settings/*
controllers (#33673)
This commit is contained in:
parent
8b24085f8e
commit
e155aab39e
16 changed files with 131 additions and 8 deletions
|
@ -30,7 +30,7 @@ class Settings::AliasesController < Settings::BaseController
|
|||
private
|
||||
|
||||
def resource_params
|
||||
params.require(:account_alias).permit(:acct)
|
||||
params.expect(account_alias: [:acct])
|
||||
end
|
||||
|
||||
def set_alias
|
||||
|
|
|
@ -21,7 +21,7 @@ class Settings::DeletesController < Settings::BaseController
|
|||
private
|
||||
|
||||
def resource_params
|
||||
params.require(:form_delete_confirmation).permit(:password, :username)
|
||||
params.expect(form_delete_confirmation: [:password, :username])
|
||||
end
|
||||
|
||||
def require_not_suspended!
|
||||
|
|
|
@ -44,6 +44,6 @@ class Settings::FeaturedTagsController < Settings::BaseController
|
|||
end
|
||||
|
||||
def featured_tag_params
|
||||
params.require(:featured_tag).permit(:name)
|
||||
params.expect(featured_tag: [:name])
|
||||
end
|
||||
end
|
||||
|
|
|
@ -90,7 +90,7 @@ class Settings::ImportsController < Settings::BaseController
|
|||
private
|
||||
|
||||
def import_params
|
||||
params.require(:form_import).permit(:data, :type, :mode)
|
||||
params.expect(form_import: [:data, :type, :mode])
|
||||
end
|
||||
|
||||
def set_bulk_import
|
||||
|
|
|
@ -33,6 +33,6 @@ class Settings::Migration::RedirectsController < Settings::BaseController
|
|||
private
|
||||
|
||||
def resource_params
|
||||
params.require(:form_redirect).permit(:acct, :current_password, :current_username)
|
||||
params.expect(form_redirect: [:acct, :current_password, :current_username])
|
||||
end
|
||||
end
|
||||
|
|
|
@ -27,7 +27,7 @@ class Settings::MigrationsController < Settings::BaseController
|
|||
private
|
||||
|
||||
def resource_params
|
||||
params.require(:account_migration).permit(:acct, :current_password, :current_username)
|
||||
params.expect(account_migration: [:acct, :current_password, :current_username])
|
||||
end
|
||||
|
||||
def set_migrations
|
||||
|
|
|
@ -18,7 +18,7 @@ class Settings::PrivacyController < Settings::BaseController
|
|||
private
|
||||
|
||||
def account_params
|
||||
params.require(:account).permit(:discoverable, :unlocked, :indexable, :show_collections, settings: UserSettings.keys)
|
||||
params.expect(account: [:discoverable, :unlocked, :indexable, :show_collections, settings: UserSettings.keys])
|
||||
end
|
||||
|
||||
def set_account
|
||||
|
|
|
@ -20,7 +20,7 @@ class Settings::ProfilesController < Settings::BaseController
|
|||
private
|
||||
|
||||
def account_params
|
||||
params.require(:account).permit(:display_name, :note, :avatar, :header, :bot, fields_attributes: [:name, :value])
|
||||
params.expect(account: [:display_name, :note, :avatar, :header, :bot, fields_attributes: [:name, :value]])
|
||||
end
|
||||
|
||||
def set_account
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue