Commit 3c11359910892daefc68d698fe28cf0862683fde
Exists in
master
and in
4 other branches
Merge pull request #5436 from Seed-Of-Hate/master
Fix for issue #5431
Showing
1 changed file
with
1 additions
and
0 deletions
Show diff stats
app/controllers/admin/users_controller.rb
@@ -47,6 +47,7 @@ class Admin::UsersController < Admin::ApplicationController | @@ -47,6 +47,7 @@ class Admin::UsersController < Admin::ApplicationController | ||
47 | @user = User.build_user(params[:user].merge(opts), as: :admin) | 47 | @user = User.build_user(params[:user].merge(opts), as: :admin) |
48 | @user.admin = (admin && admin.to_i > 0) | 48 | @user.admin = (admin && admin.to_i > 0) |
49 | @user.created_by_id = current_user.id | 49 | @user.created_by_id = current_user.id |
50 | + @user.generate_password | ||
50 | @user.confirm! | 51 | @user.confirm! |
51 | 52 | ||
52 | respond_to do |format| | 53 | respond_to do |format| |