Browse Source

add empty lines after guard clause to app/models/user.rb

git-svn-id: http://svn.redmine.org/redmine/trunk@19871 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.2.0
Toshi MARUYAMA 4 years ago
parent
commit
dcf3a07892
1 changed files with 5 additions and 0 deletions
  1. 5
    0
      app/models/user.rb

+ 5
- 0
app/models/user.rb View File



# Make sure no one can sign in with an empty login or password # Make sure no one can sign in with an empty login or password
return nil if login.empty? || password.empty? return nil if login.empty? || password.empty?

user = find_by_login(login) user = find_by_login(login)
if user if user
# user is already in local database # user is already in local database
def roles_for_project(project) def roles_for_project(project)
# No role on archived projects # No role on archived projects
return [] if project.nil? || project.archived? return [] if project.nil? || project.archived?

if membership = membership(project) if membership = membership(project)
membership.roles.to_a membership.roles.to_a
elsif project.is_public? elsif project.is_public?


roles = roles_for_project(context) roles = roles_for_project(context)
return false unless roles return false unless roles

roles.any? {|role| roles.any? {|role|
(context.is_public? || role.member?) && (context.is_public? || role.member?) &&
role.allowed_to?(action) && role.allowed_to?(action) &&
transaction do transaction do
User.where("salt IS NULL OR salt = ''").find_each do |user| User.where("salt IS NULL OR salt = ''").find_each do |user|
next if user.hashed_password.blank? next if user.hashed_password.blank?

salt = User.generate_salt salt = User.generate_salt
hashed_password = User.hash_password("#{salt}#{user.hashed_password}") hashed_password = User.hash_password("#{salt}#{user.hashed_password}")
User.where(:id => user.id).update_all(:salt => salt, :hashed_password => hashed_password) User.where(:id => user.id).update_all(:salt => salt, :hashed_password => hashed_password)


def validate_password_length def validate_password_length
return if password.blank? && generate_password? return if password.blank? && generate_password?

# Password length validation based on setting # Password length validation based on setting
if !password.nil? && password.size < Setting.password_min_length.to_i if !password.nil? && password.size < Setting.password_min_length.to_i
errors.add(:password, :too_short, :count => Setting.password_min_length.to_i) errors.add(:password, :too_short, :count => Setting.password_min_length.to_i)

Loading…
Cancel
Save