diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-07-30 18:33:35 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-07-30 18:33:35 +0000 |
| commit | 6034067d8623e87ef1391962b882fcc93196bf4b (patch) | |
| tree | a52e8b65017b8ec9a341021536b286ba355033f4 | |
| parent | 3197814c623f3541bb8b66c11af70eeedbfbee52 (diff) | |
| download | redmine-6034067d8623e87ef1391962b882fcc93196bf4b.tar.gz redmine-6034067d8623e87ef1391962b882fcc93196bf4b.zip | |
Fixed: activity atom feed broken by r1701 (#1703).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1711 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 | ||||
| -rw-r--r-- | test/functional/projects_controller_test.rb | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index ce4b24b8b..cfac01b9a 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -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 diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index 935d5ba7c..03773ccdb 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -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 |