jro_apps/redmine Commit - r15250:f4e7765e0101

0

app/helpers/routes_helper.rb +8 0

                  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)

0

app/views/activities/index.html.erb +1 -1

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

0

app/views/common/feed.atom.builder +2 -2

              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)

0

app/views/news/index.html.erb +1 -1

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

0

app/views/repositories/entry.html.erb +5 -1

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

0

app/views/repositories/revisions.html.erb +2 -2

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

0

app/views/repositories/show.html.erb +4 -3

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

	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