kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes URLs in atom feeds broken by r3681 (#5403). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3703 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2010-04-30 10:45:21 +00:00
parent 0d938dff59
commit 51c8f3143c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/functional/projects_controller_test.rb
View File

@ -447,6 +447,9 @@ class ProjectsControllerTest < ActionController::TestCase
get :activity, :format => 'atom' get :activity, :format => 'atom'
assert_response :success assert_response :success
assert_template 'common/feed.atom.rxml' assert_template 'common/feed.atom.rxml'
assert_tag :tag => 'entry', :child => {
:tag => 'link',
:attributes => {:href => 'http://test.host/issues/11'}}
end end
def test_archive def test_archive

4
vendor/plugins/acts_as_event/lib/acts_as_event.rb vendored
View File

@ -66,11 +66,11 @@ module Redmine
def event_url(options = {}) def event_url(options = {})
option = event_options[:url] option = event_options[:url]
if option.is_a?(Proc) if option.is_a?(Proc)
option.call(self) option.call(self).merge(options)
elsif option.is_a?(Hash) elsif option.is_a?(Hash)
option.merge(options) option.merge(options)
elsif option.is_a?(Symbol) elsif option.is_a?(Symbol)
send(option) send(option).merge(options)
else else
option option
end end