Fixed: activity atom feed broken by r1701 (#1703).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1711 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
3197814c62
commit
6034067d86
|
@ -240,7 +240,7 @@ class ProjectsController < ApplicationController
|
|||
render :layout => false if request.xhr?
|
||||
}
|
||||
format.atom {
|
||||
title = (@scope.size == 1) ? l("label_#{@scope.first.singularize}_plural") : l(:label_activity)
|
||||
title = (@activity.scope.size == 1) ? l("label_#{@activity.scope.first.singularize}_plural") : l(:label_activity)
|
||||
render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
|
||||
}
|
||||
end
|
||||
|
|
|
@ -202,6 +202,12 @@ class ProjectsControllerTest < Test::Unit::TestCase
|
|||
}
|
||||
end
|
||||
|
||||
def test_activity_atom_feed
|
||||
get :activity, :format => 'atom'
|
||||
assert_response :success
|
||||
assert_template 'common/feed.atom.rxml'
|
||||
end
|
||||
|
||||
def test_calendar
|
||||
get :calendar, :id => 1
|
||||
assert_response :success
|
||||
|
|
Loading…
Reference in New Issue