jro_apps/redmine Commit - r5456:b43ebcbdc4a4

Merged r5186 from trunk....

Jean-Philippe Lang -

r5456:b43ebcbdc4a4

parent child

Context file:

r5456:b43ebcbdc4a4

app/views/wiki/date_index.html.erb +2 -2

             <% unless @pages.empty? %>
             <% other_formats_links do |f| %>
-            	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'show', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
+            	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
             	<%= f.link_to('HTML', :url => {:action => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
             <% end %>
             <% end %>
             <% content_for :header_tags do %>
-            <%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'show', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+            <%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
             <% end %>

app/views/wiki/index.html.erb +2 -2

             <% unless @pages.empty? %>
             <% other_formats_links do |f| %>
-            	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'show', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
+            	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
             	<%= f.link_to('HTML', :url => {:action => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
             <% end %>
             <% end %>
             <% content_for :header_tags do %>
-            <%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'show', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+            <%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
             <% end %>

test/functional/wiki_controller_test.rb +8 0

                                 :child => { :tag => 'li', :child => { :tag => 'a', :attributes => { :href => '/projects/ecookbook/wiki/Another_page' },
                                                                                    :content => 'Another page' } }
               end
+              def test_index_should_include_atom_link
+                get :index, :project_id => 'ecookbook'
+                assert_tag 'a', :attributes => { :href => '/projects/ecookbook/activity.atom?show_wiki_edits=1'}
+              end
               context "GET :export" do
                 context "with an authorized user to export the wiki" do
                 should_assign_to :pages_by_date
                 should_render_template 'wiki/date_index'
+                should "include atom link" do
+                  assert_tag 'a', :attributes => { :href => '/projects/ecookbook/activity.atom?show_wiki_edits=1'}
+                end
               end
               def test_not_found

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages