From 9726157e3fbf926461a5122e0f766ec0d4389029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Sch=C3=A4fer?= Date: Fri, 11 Feb 2011 09:21:08 +0100 Subject: [PATCH] Fix Atom links on the wiki show page. #168 This fixes the autodiscovery link provided in the precedent commit and adds the link to the "other formats" section. --- app/views/wiki/show.rhtml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml index 057895f5..c17dd482 100644 --- a/app/views/wiki/show.rhtml +++ b/app/views/wiki/show.rhtml @@ -46,15 +46,14 @@ <% end %> <% other_formats_links do |f| %> - <%= f.link_to 'HTML', :url => {:id => @page.title, :version => @content.version} %> - <%= f.link_to 'TXT', :url => {:id => @page.title, :version => @content.version} %> + <%= 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 => {:id => @page.title, :version => @content.version} %> + <%= f.link_to 'TXT', :url => {:id => @page.title, :version => @content.version} %> <% end if User.current.allowed_to?(:export_wiki_pages, @project) %> <% content_for :header_tags do %> <%= stylesheet_link_tag 'scm' %> - <%= auto_discovery_link_tag(:atom, :format => :atom, - :controller => 'projects', :action => 'activity', :project_id => @project, - :year => nil, :month => nil, :show_wiki_pages => 1, :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 %> <% content_for :sidebar do %>