jro_apps/redmine Commit - r543:f04225321c3e

0

app/views/mailer/account_information.rhtml created 644 +9 0

@@ -0,0 +1,9
	1	<% if @user.auth_source %>You can use your "<%= @user.auth_source.name %>" account to log into Redmine.
	2	<% else %>Your Redmine account information:
	3	* Login: <%= @user.login %>
	4	* Password: <%= @password %>
	5	<% end %>
	6	Log in: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'login' %>
	7	<% unless @user.auth_source %>
	8	You can change your password here: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'my', :action => 'account' %>
	9	<% end %>

0

app/views/mailer/account_information_fr.rhtml created 644 +9 0

@@ -0,0 +1,9
	1	<% if @user.auth_source %>Vous pouvez utiliser votre compte "<%= @user.auth_source.name %>" pour vous connecter à Redmine.
	2	<% else %>Paramètres de connexion de votre compte Redmine:
	3	* Identifiant: <%= @user.login %>
	4	* Mot de passe: <%= @password %>
	5	<% end %>
	6	Pour se connecter à l'application: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'login' %>
	7	<% unless @user.auth_source %>
	8	Vous pouvez changer votre mot de passe à l'adresse: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'my', :action => 'account' %>
	9	<% end %>

0

app/controllers/users_controller.rb +1 0

                   @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

0

app/models/mailer.rb +8 0

             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)

0

app/views/users/add.rhtml +2 -1

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

0

config/environments/production.rb +3 -1

             # Disable delivery errors if you bad email addresses should just be ignored
             config.action_mailer.raise_delivery_errors = false
+            # No email in production log
+            config.action_mailer.logger = nil

0

lang/bg.yml +1 0

             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: Изпращане

0

lang/de.yml +1 0

             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

0

lang/en.yml +1 0

             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

0

lang/es.yml +1 0

             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

0

lang/fr.yml +1 0

             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

0

lang/it.yml +1 0

             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

0

lang/ja.yml +1 0

             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: 変更

0

lang/nl.yml +1 0

             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

0

lang/pt-br.yml +1 0

             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

0

lang/pt.yml +1 0

             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

0

lang/zh.yml +1 0

             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: 提交

	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