diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-04-03 10:48:59 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-04-03 10:48:59 +0000 |
| commit | 9441ab0ca8e8c4a51bf6716dbdaae0aea4f3fa21 (patch) | |
| tree | e3f468afda2267be4f6c3236143cfd01d4037785 /app/views/mailer | |
| parent | 91e24303012163d1fcdf91361486c3a80d1a1a4c (diff) | |
| download | redmine-9441ab0ca8e8c4a51bf6716dbdaae0aea4f3fa21.tar.gz redmine-9441ab0ca8e8c4a51bf6716dbdaae0aea4f3fa21.zip | |
Send email even if password is not changed (#7577).
git-svn-id: http://svn.redmine.org/redmine/trunk@16453 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/mailer')
| -rw-r--r-- | app/views/mailer/account_information.html.erb | 2 | ||||
| -rw-r--r-- | app/views/mailer/account_information.text.erb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/views/mailer/account_information.html.erb b/app/views/mailer/account_information.html.erb index 4d4066d65..d010431ab 100644 --- a/app/views/mailer/account_information.html.erb +++ b/app/views/mailer/account_information.html.erb @@ -4,7 +4,9 @@ <p><%= l(:mail_body_account_information) %>:</p> <ul> <li><%= l(:field_login) %>: <%= @user.login %></li> + <% if @password %> <li><%= l(:field_password) %>: <%= @password %></li> + <% end %> </ul> <% end %> diff --git a/app/views/mailer/account_information.text.erb b/app/views/mailer/account_information.text.erb index 0a02566d9..f2f37d9c3 100644 --- a/app/views/mailer/account_information.text.erb +++ b/app/views/mailer/account_information.text.erb @@ -1,6 +1,6 @@ <% if @user.auth_source %><%= l(:mail_body_account_information_external, @user.auth_source.name) %> <% else %><%= l(:mail_body_account_information) %>: * <%= l(:field_login) %>: <%= @user.login %> -* <%= l(:field_password) %>: <%= @password %> +<% if @password %>* <%= l(:field_password) %>: <%= @password %><% end %> <% end %> <%= l(:label_login) %>: <%= @login_url %> |