Merge pull request #5436 from Seed-Of-Hate/master

Fix for issue #5431
2013-10-24 11:46:39 -07:00 · 2013-10-24 11:46:39 -07:00 · 3c11359910
parent 7d8998cf38 0f3ef9bed2
commit 3c11359910
1 changed files with 1 additions and 0 deletions
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@ -47,6 +47,7 @@ class Admin::UsersController < Admin::ApplicationController
    @user = User.build_user(params[:user].merge(opts), as: :admin)
    @user.admin = (admin && admin.to_i > 0)
    @user.created_by_id = current_user.id
+    @user.generate_password
    @user.confirm!

    respond_to do |format|