lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #223 from bigbluebutton/settings-fix 

Fix Greenlight accounts unable to update settings.
This commit is contained in:
Joshua Arts 2018-07-13 10:35:19 -04:00 committed by GitHub
parent 8089decc17 a6b05f5fd3
commit 29e273f5a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@ -58,7 +58,7 @@ class UsersController < ApplicationController
end
if errors.empty? && @user.save
# Notify the use that their account has been updated.
# Notify the user that their account has been updated.
redirect_to edit_user_path(@user), notice: "Information successfully updated."
else
# Append custom errors.

2
app/models/user.rb
View File

@ -14,7 +14,7 @@ class User < ApplicationRecord
uniqueness: { case_sensitive: false },
format: { with: /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i }
validates :password, length: { minimum: 6 }, confirmation: true, if: :greenlight_account?
validates :password, length: { minimum: 6 }, confirmation: true, if: :greenlight_account?, on: :create
# We don't want to require password validations on all accounts.
has_secure_password(validations: false)