diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-05-10 10:30:10 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-05-10 10:30:10 +0000 |
| commit | c8fb0956d15b8518c4fa38cc0ed5acff52e4c4b8 (patch) | |
| tree | 11aa226d1d0dd3644ac170746fcc3673eea13efa | |
| parent | 51f7060aa8464f51f78403f87b3556a7ffaa1995 (diff) | |
| download | redmine-c8fb0956d15b8518c4fa38cc0ed5acff52e4c4b8.tar.gz redmine-c8fb0956d15b8518c4fa38cc0ed5acff52e4c4b8.zip | |
Code cleanup (#19458).
git-svn-id: http://svn.redmine.org/redmine/trunk@14265 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/user.rb | 7 | ||||
| -rw-r--r-- | app/views/my/password.html.erb | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 5978f06de..3ecf03c18 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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 diff --git a/app/views/my/password.html.erb b/app/views/my/password.html.erb index 6ba2bfc40..7a411e51a 100644 --- a/app/views/my/password.html.erb +++ b/app/views/my/password.html.erb @@ -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 %> |