zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-07 13:15:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Rename users.password to users.plain_text_password

Browse source 
Otherwise it conflicts with Devise
This commit is contained in:
Artur Beljajev 2018-07-13 23:09:21 +03:00
parent 22e70e7707
commit 32ecf36057
19 changed files with 32 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/api_users_controller.rb
View file

@ -32,7 +32,7 @@ module Admin
end
def update
params[:api_user].delete(:password) if params[:api_user][:password].blank?
params[:api_user].delete(:plain_text_password) if params[:api_user][:plain_text_password].blank?
if @api_user.update(api_user_params)
flash[:notice] = I18n.t('record_updated')
redirect_to [:admin, @api_user]
@ -59,7 +59,7 @@ module Admin
end
def api_user_params
params.require(:api_user).permit(:username, :password, :active,
params.require(:api_user).permit(:username, :plain_text_password, :active,
:registrar_id, :registrar_typeahead,
:identity_code, { roles: [] })
end