add extra user fields
This commit is contained in:
@@ -47,6 +47,14 @@ class UsersController < ApplicationController
|
|||||||
attrs = user_params.compact_blank.merge(user_params.slice(:archived_at))
|
attrs = user_params.compact_blank.merge(user_params.slice(:archived_at))
|
||||||
attrs.delete(:role) if !role_valid?(attrs[:role]) || current_user == @user
|
attrs.delete(:role) if !role_valid?(attrs[:role]) || current_user == @user
|
||||||
|
|
||||||
|
if params.dig(:user, :account_id).present?
|
||||||
|
account = Account.accessible_by(current_ability).find(params[:user][:account_id])
|
||||||
|
|
||||||
|
authorize!(:manage, account)
|
||||||
|
|
||||||
|
@user.account = account
|
||||||
|
end
|
||||||
|
|
||||||
if @user.update(attrs)
|
if @user.update(attrs)
|
||||||
redirect_back fallback_location: settings_users_path, notice: 'User has been updated'
|
redirect_back fallback_location: settings_users_path, notice: 'User has been updated'
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -19,6 +19,9 @@
|
|||||||
<% if f.object != current_user %>
|
<% if f.object != current_user %>
|
||||||
<%= render 'role_select', f: %>
|
<%= render 'role_select', f: %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
<% if local_assigns[:extra_fields_html].present? %>
|
||||||
|
<%= local_assigns[:extra_fields_html] %>
|
||||||
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-control pt-2">
|
<div class="form-control pt-2">
|
||||||
<%= f.button button_title, class: 'base-button' %>
|
<%= f.button button_title, class: 'base-button' %>
|
||||||
|
|||||||
Reference in New Issue
Block a user