Fixed: activity atom feed broken by r1701 (#1703).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1711 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ce4b24b8b78797ec0258091ab59cc60f4bd86f1e..cfac01b9a7380b61a6c5034fb15dd07568131f8e 100644 (file)
--- 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 935d5ba7c01b8a8c25da06720f688971fcfbb2da..03773ccdb5c3f6d276ae8c202edf3fc02eb9fdcb 100644 (file)
--- 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