jro_apps/redmine Commit - r2458:4baf32b166a6

Fixing Plugin and Mailer default_url_options....

Eric Davis -

r2458:4baf32b166a6

parent child

Context file:

r2458:4baf32b166a6

app/models/mailer.rb +6 -6

               include ActionController::UrlWriter
               include Redmine::I18n
+              def self.default_url_options
+                h = Setting.host_name
+                h = h.to_s.gsub(%r{\/.*$}, '') unless Redmine::Utils.relative_url_root.blank?
+                { :host => h, :protocol => Setting.protocol }
+              end
               def issue_add(issue)
                 redmine_headers 'Project' => issue.project.identifier,
                                 'Issue-Id' => issue.id,
                 set_language_if_valid Setting.default_language
                 from Setting.mail_from
-                # URL options
-                h = Setting.host_name
-                h = h.to_s.gsub(%r{\/.*$}, '') unless Redmine::Utils.relative_url_root.blank?
-                default_url_options[:host] = h
-                default_url_options[:protocol] = Setting.protocol
                 # Common headers
                 headers 'X-Mailer' => 'Redmine',
                         'X-Redmine-Host' => Setting.host_name,

lib/redmine/hook.rb +8 -2

                     returning [] do |response|
                       hls = hook_listeners(hook)
                       if hls.any?
-                        default_url_options[:only_path] ||= true
                         hls.each {|listener| response << listener.send(hook, context)}
                       end
                     end
                     Redmine::Hook.add_listener(child)
                     super
                   end
                 end
                 # Listener class used for views hooks.
                 # Listeners that inherit this class will include various helpers by default.
                 class ViewListener < Listener
                   include ActionController::UrlWriter
                   include ApplicationHelper
+                  # Default to creating links using only the path.  Subclasses can
+                  # change this default as needed
+                  def self.default_url_options
+                    {:only_path => true }
+                  end
                   # Helper method to directly render a partial using the context:
                   #
                   #   class MyHook < Redmine::Hook::ViewListener

test/unit/lib/redmine/hook_test.rb +19 -1

             class Redmine::Hook::ManagerTest < Test::Unit::TestCase
+              fixtures :issues
               # Some hooks that are manually registered in these tests
               class TestHook < Redmine::Hook::ViewListener; end
               def teardown
                 @hook_module.clear_listeners
-                @hook_module.default_url_options = { }
               end
               def test_clear_listeners
                 assert_equal 'Test hook 1 listener. Test hook 2 listener.',
                              @view_hook_helper.call_hook(:view_layouts_base_html_head)
               end
+              def test_call_hook_should_not_change_the_default_url_for_email_notifications
+                issue = Issue.find(1)
+                ActionMailer::Base.deliveries.clear
+                Mailer.deliver_issue_add(issue)
+                mail = ActionMailer::Base.deliveries.last
+                @hook_module.add_listener(TestLinkToHook)
+                @hook_helper.call_hook(:view_layouts_base_html_head)
+                ActionMailer::Base.deliveries.clear
+                Mailer.deliver_issue_add(issue)
+                mail2 = ActionMailer::Base.deliveries.last
+                assert_equal mail.body, mail2.body
+               end
             end

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