Commit 71e436bd authored by jplang's avatar jplang

Don't generate urls with params.

git-svn-id: https://svn.redmine.org/redmine/trunk@15632 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 72332da1
......@@ -29,6 +29,14 @@ module RoutesHelper
end
end
def _project_news_path(project, *args)
if project
project_news_index_path(project, *args)
else
news_index_path(*args)
end
end
def _new_project_issue_path(project, *args)
if project
new_project_issue_path(project, *args)
......
......@@ -42,7 +42,7 @@
<% end %>
<% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :from => nil, :key => User.current.rss_key)) %>
<%= auto_discovery_link_tag(:atom, :params => request.query_parameters.merge(:from => nil, :key => User.current.rss_key), :format => 'atom') %>
<% end %>
<% content_for :sidebar do %>
......
xml.instruct!
xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
xml.title truncate_single_line_raw(@title, 100)
xml.link "rel" => "self", "href" => url_for(params.merge(:only_path => false))
xml.link "rel" => "alternate", "href" => url_for(params.merge(:only_path => false, :format => nil, :key => nil))
xml.link "rel" => "self", "href" => url_for(:params => request.query_parameters, :only_path => false, :format => 'atom')
xml.link "rel" => "alternate", "href" => url_for(:params => request.query_parameters.merge(:format => nil, :key => nil), :only_path => false)
xml.id home_url
xml.icon favicon_url
xml.updated((@items.first ? @items.first.event_datetime : Time.now).xmlschema)
......
......@@ -44,7 +44,7 @@
<% end %>
<% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
<%= auto_discovery_link_tag(:atom, _project_news_path(@project, :key => User.current.rss_key, :format => 'atom')) %>
<%= stylesheet_link_tag 'scm' %>
<% end %>
......
......@@ -9,7 +9,11 @@
<%= render :partial => 'link_to_functions' %>
<% if Redmine::MimeType.is_type?('image', @path) %>
<%= render :partial => 'common/image', :locals => {:path => url_for(params.merge(:action => 'raw')), :alt => @path} %>
<%= render :partial => 'common/image', :locals => {:path => url_for(:action => 'raw',
:id => @project,
:repository_id => @repository.identifier_param,
:path => @path,
:rev => @rev), :alt => @path} %>
<% elsif @content %>
<%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
<% else %>
......
......@@ -23,8 +23,8 @@
<%= stylesheet_link_tag "scm" %>
<%= auto_discovery_link_tag(
:atom,
params.merge(
{:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
:params => request.query_parameters.merge(:page => nil, :key => User.current.rss_key),
:format => 'atom') %>
<% end %>
<% other_formats_links do |f| %>
......
......@@ -42,9 +42,10 @@
<% if @repository.supports_all_revisions? %>
<% content_for :header_tags do %>
<%= auto_discovery_link_tag(
:atom, params.merge(
{:format => 'atom', :action => 'revisions',
:id => @project, :page => nil, :key => User.current.rss_key})) %>
:atom,
:action => 'revisions', :id => @project,
:repository_id => @repository.identifier_param,
:key => User.current.rss_key) %>
<% end %>
<% other_formats_links do |f| %>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment