| @@ -447,6 +447,9 class ProjectsControllerTest < ActionController::TestCase | |||
|
|
447 | 447 | get :activity, :format => 'atom' |
|
|
448 | 448 | assert_response :success |
|
|
449 | 449 | assert_template 'common/feed.atom.rxml' |
|
|
450 | assert_tag :tag => 'entry', :child => { | |
|
|
451 | :tag => 'link', | |
|
|
452 | :attributes => {:href => 'http://test.host/issues/11'}} | |
|
|
450 | 453 | end |
|
|
451 | 454 | |
|
|
452 | 455 | def test_archive |
| @@ -66,11 +66,11 module Redmine | |||
|
|
66 | 66 | def event_url(options = {}) |
|
|
67 | 67 | option = event_options[:url] |
|
|
68 | 68 | if option.is_a?(Proc) |
|
|
69 | option.call(self) | |
|
|
69 | option.call(self).merge(options) | |
|
|
70 | 70 | elsif option.is_a?(Hash) |
|
|
71 | 71 | option.merge(options) |
|
|
72 | 72 | elsif option.is_a?(Symbol) |
|
|
73 | send(option) | |
|
|
73 | send(option).merge(options) | |
|
|
74 | 74 | else |
|
|
75 | 75 | option |
|
|
76 | 76 | end |
General Comments 0
You need to be logged in to leave comments.
Login now