jro_apps/redmine Commit - r1987:006337fb0e8c

Host setting should contain the path prefix (Redmine base URL) to properly generate links in emails that are sent offline (#2122)....

Jean-Philippe Lang -

r1987:006337fb0e8c

parent child

Context file:

r1987:006337fb0e8c

app/controllers/settings_controller.rb +3 0

                 @options = {}
                 @options[:user_format] = User::USER_FORMATS.keys.collect {|f| [User.current.name(f), f.to_s] }
                 @deliveries = ActionMailer::Base.perform_deliveries
+                @guessed_host_and_path = request.host_with_port
+                @guessed_host_and_path << ('/'+ request.relative_url_root.gsub(%r{^\/}, '')) unless request.relative_url_root.blank?
               end
               def plugin

app/models/mailer.rb +1 0

                 from Setting.mail_from
                 default_url_options[:host] = Setting.host_name
                 default_url_options[:protocol] = Setting.protocol
+                default_url_options[:skip_relative_url_root] = true
                 # Common headers
                 headers 'X-Mailer' => 'Redmine',
                         'X-Redmine-Host' => Setting.host_name,

app/views/settings/_general.rhtml +2 -1

             <%= text_field_tag 'settings[activity_days_default]', Setting.activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p>
             <p><label><%= l(:setting_host_name) %></label>
-            <%= text_field_tag 'settings[host_name]', Setting.host_name, :size => 60 %></p>
+            <%= text_field_tag 'settings[host_name]', Setting.host_name, :size => 60 %><br />
+            <em><%= l(:label_example) %>: <%= @guessed_host_and_path %></em></p>
             <p><label><%= l(:setting_protocol) %></label>
             <%= select_tag 'settings[protocol]', options_for_select(['http', 'https'], Setting.protocol) %></p>

lang/en.yml +2 -1

             setting_mail_from: Emission email address
             setting_bcc_recipients: Blind carbon copy recipients (bcc)
             setting_plain_text_mail: plain text mail (no HTML)
-            setting_host_name: Host name
+            setting_host_name: Host name and path
             setting_text_formatting: Text formatting
             setting_wiki_compression: Wiki history compression
             setting_feeds_limit: Feed content limit
             label_incoming_emails: Incoming emails
             label_generate_key: Generate a key
             label_issue_watchers: Watchers
+            label_example: Example
             button_login: Login
             button_submit: Submit

lang/fr.yml +2 -1

             setting_mail_from: Adresse d'émission
             setting_bcc_recipients: Destinataires en copie cachée (cci)
             setting_plain_text_mail: Mail texte brut (non HTML)
-            setting_host_name: Nom d'hôte
+            setting_host_name: Nom d'hôte et chemin
             setting_text_formatting: Formatage du texte
             setting_wiki_compression: Compression historique wiki
             setting_feeds_limit: Limite du contenu des flux RSS
             label_incoming_emails: Emails entrants
             label_generate_key: Générer une clé
             label_issue_watchers: Utilisateurs surveillant cette demande
+            label_example: Exemple
             button_login: Connexion
             button_submit: Soumettre

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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