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

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

Fixed: activity atom feed broken by r1701 (#1703).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1711 e93f8b46-1217-0410-a6f0-8f06a7374b81
6034067d · Jean-Philippe Lang · 3197814c · 6034067d · 6034067d
Commit 6034067d authored Jul 30, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

projects_controller.rb app/controllers/projects_controller.rb +1 -1

projects_controller_test.rb test/functional/projects_controller_test.rb +6 -0

No files found.
--- 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

--- 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