meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Send email even if password is not changed (#7577).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16453 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2017-04-03 10:48:59 +00:00
parent 91e2430301
commit 9441ab0ca8
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@ -140,7 +140,7 @@ class UsersController < ApplicationController
if was_activated if was_activated
Mailer.account_activated(@user).deliver Mailer.account_activated(@user).deliver
elsif @user.active? && params[:send_information] && @user.password.present? && @user.auth_source_id.nil? && @user != User.current elsif @user.active? && params[:send_information] && @user != User.current
Mailer.account_information(@user, @user.password).deliver Mailer.account_information(@user, @user.password).deliver
end end

2
app/views/mailer/account_information.html.erb
View File

@ -4,7 +4,9 @@
<p><%= l(:mail_body_account_information) %>:</p> <p><%= l(:mail_body_account_information) %>:</p>
<ul> <ul>
<li><%= l(:field_login) %>: <%= @user.login %></li> <li><%= l(:field_login) %>: <%= @user.login %></li>
<% if @password %>
<li><%= l(:field_password) %>: <%= @password %></li> <li><%= l(:field_password) %>: <%= @password %></li>
<% end %>
</ul> </ul>
<% end %> <% end %>

2
app/views/mailer/account_information.text.erb
View File

@ -1,6 +1,6 @@
<% if @user.auth_source %><%= l(:mail_body_account_information_external, @user.auth_source.name) %> <% if @user.auth_source %><%= l(:mail_body_account_information_external, @user.auth_source.name) %>
<% else %><%= l(:mail_body_account_information) %>: <% else %><%= l(:mail_body_account_information) %>:
* <%= l(:field_login) %>: <%= @user.login %> * <%= l(:field_login) %>: <%= @user.login %>
* <%= l(:field_password) %>: <%= @password %> <% if @password %>* <%= l(:field_password) %>: <%= @password %><% end %>
<% end %> <% end %>
<%= l(:label_login) %>: <%= @login_url %> <%= l(:label_login) %>: <%= @login_url %>

2
app/views/users/_general.html.erb
View File

@ -1,7 +1,7 @@
<%= labelled_form_for @user, :html => {:multipart => true} do |f| %> <%= labelled_form_for @user, :html => {:multipart => true} do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<% if @user.active? && email_delivery_enabled? && @user != User.current -%> <% if @user.active? && email_delivery_enabled? && @user != User.current -%>
<p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p> <p><label><%= check_box_tag 'send_information', 1, params[:send_information] %> <%= l(:label_send_information) %></label></p>
<% end -%> <% end -%>
<p><%= submit_tag l(:button_save) %></p> <p><%= submit_tag l(:button_save) %></p>
<% end %> <% end %>

2
app/views/users/new.html.erb
View File

@ -3,7 +3,7 @@
<%= labelled_form_for @user, :html => {:multipart => true} do |f| %> <%= labelled_form_for @user, :html => {:multipart => true} do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<% if email_delivery_enabled? %> <% if email_delivery_enabled? %>
<p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p> <p><label><%= check_box_tag 'send_information', 1, params[:send_information] %> <%= l(:label_send_information) %></label></p>
<% end %> <% end %>
<p> <p>
<%= submit_tag l(:button_create) %> <%= submit_tag l(:button_create) %>