git-svn-id: http://svn.redmine.org/redmine/trunk@16453 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/3.4.0
@@ -140,7 +140,7 @@ class UsersController < ApplicationController | |||
if was_activated | |||
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 | |||
end | |||
@@ -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 %> | |||
@@ -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 %> |
@@ -1,7 +1,7 @@ | |||
<%= labelled_form_for @user, :html => {:multipart => true} do |f| %> | |||
<%= render :partial => 'form', :locals => { :f => f } %> | |||
<% 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 -%> | |||
<p><%= submit_tag l(:button_save) %></p> | |||
<% end %> |
@@ -3,7 +3,7 @@ | |||
<%= labelled_form_for @user, :html => {:multipart => true} do |f| %> | |||
<%= render :partial => 'form', :locals => { :f => f } %> | |||
<% 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 %> | |||
<p> | |||
<%= submit_tag l(:button_create) %> |