We were getting a warning since upgrading to Rails 6.1: DEPRECATION WARNING: Calling `delete` to an ActiveModel::Errors messages hash is deprecated. Please call `ActiveModel::Errors#delete` instead. So we're deleting the error instead of deleting the message.
39 lines
1.0 KiB
Ruby
39 lines
1.0 KiB
Ruby
class AccountController < ApplicationController
|
|
before_action :authenticate_user!
|
|
before_action :set_account
|
|
load_and_authorize_resource class: "User"
|
|
|
|
def show
|
|
end
|
|
|
|
def update
|
|
if @account.update(account_params)
|
|
redirect_to account_path, notice: t("flash.actions.save_changes.notice")
|
|
else
|
|
@account.errors.delete(:organization)
|
|
render :show
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def set_account
|
|
@account = current_user
|
|
end
|
|
|
|
def account_params
|
|
params.require(:account).permit(allowed_params)
|
|
end
|
|
|
|
def allowed_params
|
|
if @account.organization?
|
|
[:phone_number, :email_on_comment, :email_on_comment_reply, :newsletter,
|
|
organization_attributes: [:name, :responsible_name]]
|
|
else
|
|
[:username, :public_activity, :public_interests, :email_on_comment,
|
|
:email_on_comment_reply, :email_on_direct_message, :email_digest, :newsletter,
|
|
:official_position_badge, :recommended_debates, :recommended_proposals]
|
|
end
|
|
end
|
|
end
|