jro_apps/redmine Commit - r13883:c8fb0956d15b

Code cleanup (#19458)....

Jean-Philippe Lang -

r13883:c8fb0956d15b

parent child

Context file:

r13883:c8fb0956d15b

app/models/user.rb +3 -4

                 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)
+                if Setting.password_max_age.to_i.zero?
-                period = Setting.password_max_age.to_i
-                if period.zero?
                   false
                 else
+                  changed_on = self.passwd_changed_on || Time.at(0)
                   changed_on < period.days.ago
                 end
               end

app/views/my/password.html.erb +1 -1

             <%= 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 %>

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages