summaryrefslogtreecommitdiffstats
path: root/app/views/my
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-05-10 10:26:55 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-05-10 10:26:55 +0000
commit51f7060aa8464f51f78403f87b3556a7ffaa1995 (patch)
treecb7a82d8d788a2e71bb57de7e536bd7048e956f8 /app/views/my
parent92833d0b10e7c46477e1485a4bf616649aee544e (diff)
downloadredmine-51f7060aa8464f51f78403f87b3556a7ffaa1995.tar.gz
redmine-51f7060aa8464f51f78403f87b3556a7ffaa1995.zip
Add the ability to expire passwords after a configurable number of days (#19458).
Patch by Holger Just and Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@14264 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/my')
-rw-r--r--app/views/my/password.html.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/my/password.html.erb b/app/views/my/password.html.erb
index c3f86b99f..6ba2bfc40 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? %>
+<% unless @user.must_change_passwd? || @user.password_expired? %>
<% content_for :sidebar do %>
<%= render :partial => 'sidebar' %>
<% end %>