Account information can now be sent to the user when creating an account.

ActionMailer logger set to nil for production environment to disable email contents output in production.log

git-svn-id: http://redmine.rubyforge.org/svn/trunk@546 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 45cec2e7aec502f44b265a3805ff45f543cb78e3..93b3a4d25426ef5d50e4c16bfa25be347fc1898c 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -61,6 +61,7 @@ class UsersController < ApplicationController
       @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
       @user.custom_values = @custom_values                     
       if @user.save
+        Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
         flash[:notice] = l(:notice_successful_create)
         redirect_to :action => 'list'
       end

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 41b5a329194b083337fd0d768feeab88acf25849..62d5c1635a4299cb25d53ff23032ced17c053c84 100644 (file)
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -17,6 +17,14 @@
 
 class Mailer < ActionMailer::Base
   helper IssuesHelper
+  
+  def account_information(user, password)
+    set_language_if_valid user.language
+    recipients user.mail
+    from Setting.mail_from
+    subject l(:mail_subject_register)
+    body :user => user, :password => password
+  end
 
   def issue_add(issue)
     set_language_if_valid(Setting.default_language)

diff --git a/app/views/mailer/account_information.rhtml b/app/views/mailer/account_information.rhtml
new file mode 100644 (file)
index 0000000..058d5fc
--- /dev/null
+++ b/app/views/mailer/account_information.rhtml
@@ -0,0 +1,9 @@
+<% if @user.auth_source %>You can use your "<%= @user.auth_source.name %>" account to log into Redmine.
+<% else %>Your Redmine account information:
+* Login:    <%= @user.login %>
+* Password: <%= @password %>
+<% end %>
+Log in: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'login' %>
+<% unless @user.auth_source %>
+You can change your password here: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'my', :action => 'account' %>
+<% end %>

diff --git a/app/views/mailer/account_information_fr.rhtml b/app/views/mailer/account_information_fr.rhtml
new file mode 100644 (file)
index 0000000..9210988
--- /dev/null
+++ b/app/views/mailer/account_information_fr.rhtml
@@ -0,0 +1,9 @@
+<% if @user.auth_source %>Vous pouvez utiliser votre compte "<%= @user.auth_source.name %>" pour vous connecter à Redmine.
+<% else %>Paramètres de connexion de votre compte Redmine:
+* Identifiant:  <%= @user.login %>
+* Mot de passe: <%= @password %>
+<% end %>
+Pour se connecter à l'application: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'login' %>
+<% unless @user.auth_source %>
+Vous pouvez changer votre mot de passe à l'adresse: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'my', :action => 'account' %>
+<% end %>

diff --git a/app/views/users/add.rhtml b/app/views/users/add.rhtml
index d4c6a15f4e96bb239d7658eccea60dc29eef3547..636bdcbcdfb08cc5ee6860ae19f7c86c8134e696 100644 (file)
--- a/app/views/users/add.rhtml
+++ b/app/views/users/add.rhtml
@@ -3,4 +3,5 @@
 <% labelled_tabular_form_for :user, @user, :url => { :action => "add" } do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
-<% end %>
\ No newline at end of file
+<%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %>
+<% end %>

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 4cd4e086b8027ad9ecb8a63646809d8241f84c9c..eeafd959e4d9f118a84386a0f4f0bf5d9e2d5695 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -17,4 +17,6 @@ config.action_controller.perform_caching             = true
 \r
 # Disable delivery errors if you bad email addresses should just be ignored
 config.action_mailer.raise_delivery_errors = false
-\r
+
+# No email in production log
+config.action_mailer.logger = nil\r

diff --git a/lang/bg.yml b/lang/bg.yml
index 47ade6312317c57905521d48dfab98297fec019c..47281f068ce66440b0e85b69d168eff2939e64dd 100644 (file)
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -395,6 +395,7 @@ label_message_plural: Messages
 label_message_last: Last message
 label_message_new: New message
 label_reply_plural: Replies
+label_send_information: Send account information to the user
 
 button_login: Вход
 button_submit: Изпращане

diff --git a/lang/de.yml b/lang/de.yml
index 3fc39dad591c29f9111df20bc4a4b3d5a371dcbe..5b23bc7d2b4a2441fb7dba1cfaf8272253dc6ea7 100644 (file)
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -395,6 +395,7 @@ label_message_plural: Messages
 label_message_last: Last message
 label_message_new: New message
 label_reply_plural: Replies
+label_send_information: Send account information to the user
 
 button_login: Einloggen
 button_submit: OK

diff --git a/lang/en.yml b/lang/en.yml
index 9cc452d8f83d1df5c32fa4e30d5827c896fc30e5..c6cb1a770009c7bc3aa55aa6af02f5ca7fa35673 100644 (file)
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -395,6 +395,7 @@ label_message_plural: Messages
 label_message_last: Last message
 label_message_new: New message
 label_reply_plural: Replies
+label_send_information: Send account information to the user
 
 button_login: Login
 button_submit: Submit

diff --git a/lang/es.yml b/lang/es.yml
index 523754c3da02b82a23be1cf39e4d35ffc6808eed..c46ec9c570c66eefa42f7de715e916ae73eed80d 100644 (file)
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -395,6 +395,7 @@ label_message_plural: Messages
 label_message_last: Last message
 label_message_new: New message
 label_reply_plural: Replies
+label_send_information: Send account information to the user
 
 button_login: Conexión
 button_submit: Someter

diff --git a/lang/fr.yml b/lang/fr.yml
index 35812bc7fb51f356e12532745be82ceb5d0bb988..7231c558bc28014ebcae27da559cee0755fc8861 100644 (file)
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -395,6 +395,7 @@ label_message_plural: Messages
 label_message_last: Dernier message
 label_message_new: Nouveau message
 label_reply_plural: Réponses
+label_send_information: Envoyer les informations à l'utilisateur
 
 button_login: Connexion
 button_submit: Soumettre

diff --git a/lang/it.yml b/lang/it.yml
index 77a12162a88344ae9b81b961a218c93c5068c2a1..827dcfd062e49bf7180d763f41c6feaa15d16f81 100644 (file)
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -395,6 +395,7 @@ label_message_plural: Messages
 label_message_last: Last message
 label_message_new: New message
 label_reply_plural: Replies
+label_send_information: Send account information to the user
 
 button_login: Login
 button_submit: Invia

diff --git a/lang/ja.yml b/lang/ja.yml
index 357777d3b4858d97ab5446d0984c74ed6fc91043..d3fce4f73603a2670f5ac268719e79b524650252 100644 (file)
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -396,6 +396,7 @@ label_message_plural: Messages
 label_message_last: Last message
 label_message_new: New message
 label_reply_plural: Replies
+label_send_information: Send account information to the user
 
 button_login: ログイン
 button_submit: 変更

diff --git a/lang/nl.yml b/lang/nl.yml
index 8b706f013ea774064713decbe3ce17b5ef643ff0..5f713f4154c013370d81b2512e4b031b05cc6aa5 100644 (file)
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -395,6 +395,7 @@ label_message_plural: Berichten
 label_message_last: Laatste bericht
 label_message_new: Nieuw bericht
 label_reply_plural: Antwoorden
+label_send_information: Send account information to the user
 
 button_login: Inloggen
 button_submit: Toevoegen

diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index f3a6caf7411683dc5cae44a8168e422df7d03a3b..3171f89459a3bf9068bee97c7b5fe938ad1b83b9 100644 (file)
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -395,6 +395,7 @@ label_message_plural: Messages
 label_message_last: Last message\r
 label_message_new: New message\r
 label_reply_plural: Replies\r
+label_send_information: Send account information to the user\r
 \r
 button_login: Login\r
 button_submit: Enviar\r

diff --git a/lang/pt.yml b/lang/pt.yml
index 231b9699249bd2a30160b0274ebe3cae670f4d5e..b91cfa2da2b42ed274297144d0c9ea8fc77d77d9 100644 (file)
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -395,6 +395,7 @@ label_message_plural: Messages
 label_message_last: Last message
 label_message_new: New message
 label_reply_plural: Replies
+label_send_information: Send account information to the user
 
 button_login: Login
 button_submit: Enviar

diff --git a/lang/zh.yml b/lang/zh.yml
index 8f05ec9e2cd38abcb976d4216292c9fbfbcb75f5..17aef65bd23cd5ce866acf4bc8c131024e51d79e 100644 (file)
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -398,6 +398,7 @@ label_message_plural: Messages
 label_message_last: Last message
 label_message_new: New message
 label_reply_plural: Replies
+label_send_information: Send account information to the user
 
 button_login: 登录
 button_submit: 提交