git-svn-id: http://svn.redmine.org/redmine/trunk@14265 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/3.1.0
@@ -323,13 +323,12 @@ class User < Principal | |||
return auth_source.allow_password_changes? | |||
end | |||
# Returns true if the user password has expired | |||
def password_expired? | |||
changed_on = self.passwd_changed_on || Time.at(0) | |||
period = Setting.password_max_age.to_i | |||
if period.zero? | |||
if Setting.password_max_age.to_i.zero? | |||
false | |||
else | |||
changed_on = self.passwd_changed_on || Time.at(0) | |||
changed_on < period.days.ago | |||
end | |||
end |
@@ -17,7 +17,7 @@ | |||
<%= submit_tag l(:button_apply) %> | |||
<% end %> | |||
<% unless @user.must_change_passwd? || @user.password_expired? %> | |||
<% unless @user.must_change_password? %> | |||
<% content_for :sidebar do %> | |||
<%= render :partial => 'sidebar' %> | |||
<% end %> |