jro_apps/redmine Commit - r15250:f4e7765e0101

Don't generate urls with params....

Jean-Philippe Lang -

r15250:f4e7765e0101

parent child

Context file:

r15250:f4e7765e0101

Collapse all files

app/helpers/routes_helper.rb +8 0

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module RoutesHelper
               # Returns the path to project issues or to the cross-project
               # issue list if project is nil
               def _project_issues_path(project, *args)
                 if project
                   project_issues_path(project, *args)
                 else
                   issues_path(*args)
                 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)
                 else
                   new_issue_path(*args)
                 end
               end
               def _project_calendar_path(project, *args)
                 project ? project_calendar_path(project, *args) : issues_calendar_path(*args)
               end
               def _project_gantt_path(project, *args)
                 project ? project_gantt_path(project, *args) : issues_gantt_path(*args)
               end
               def _time_entries_path(project, issue, *args)
                 if issue
                   issue_time_entries_path(issue, *args)
                 elsif project
                   project_time_entries_path(project, *args)
                 else
                   time_entries_path(*args)
                 end
               end
               def _report_time_entries_path(project, issue, *args)
                 if issue
                   report_issue_time_entries_path(issue, *args)
                 elsif project
                   report_project_time_entries_path(project, *args)
                 else
                   report_time_entries_path(*args)
                 end
               end
               def _new_time_entry_path(project, issue, *args)
                 if issue
                   new_issue_time_entry_path(issue, *args)
                 elsif project
                   new_project_time_entry_path(project, *args)
                 else
                   new_time_entry_path(*args)
                 end
               end
               def board_path(board, *args)
                 project_board_path(board.project, board, *args)
               end
             end

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

             <h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h2>
             <p class="subtitle"><%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %></p>
             <div id="activity">
             <% @events_by_day.keys.sort.reverse.each do |day| %>
             <h3><%= format_activity_day(day) %></h3>
             <dl>
             <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
               <dt class="<%= e.event_type %> <%= "grouped" if in_group %> <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
               <%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
               <span class="time"><%= format_time(e.event_datetime, false) %></span>
               <%= content_tag('span', e.project, :class => 'project') if @project.nil? || @project != e.project %>
               <%= link_to format_activity_title(e.event_title), e.event_url %>
               </dt>
               <dd class="<%= "grouped" if in_group %>"><span class="description"><%= format_activity_description(e.event_description) %></span>
               <span class="author"><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %></span></dd>
             <% end -%>
             </dl>
             <% end -%>
             </div>
             <%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
             <span class="pagination">
               <ul class="pages">
                 <li class="previous page">
             <%= link_to("\xc2\xab " + l(:label_previous),
                                {:params => request.query_parameters.merge(:from => @date_to - @days - 1)},
                                :title => l(:label_date_from_to, :start => format_date(@date_to - 2*@days), :end => format_date(@date_to - @days - 1)),
                                :accesskey => accesskey(:previous)) %>
                 </li><% unless @date_to >= User.current.today %><li class="next page">
             <%= link_to(l(:label_next) + " \xc2\xbb",
                                {:params => request.query_parameters.merge(:from => @date_to + @days - 1)},
                                :title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1)),
                                :accesskey => accesskey(:next)) %><% end %>
                 </li>
               </ul>
             </span>
             &nbsp;
             <% other_formats_links do |f| %>
               <%= f.link_to_with_query_parameters 'Atom', 'from' => nil, :key => User.current.rss_key %>
             <% 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 %>
             <%= form_tag({}, :method => :get) do %>
             <h3><%= l(:label_activity) %></h3>
             <ul>
             <% @activity.event_types.each do |t| %>
               <li>
                 <%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
                 <label for="show_<%=t%>">
                   <%= link_to(l("label_#{t.singularize}_plural"),
                               {"show_#{t}" => 1, :user_id => params[:user_id], :from => params[:from]})%>
                 </label>
               </li>
             <% end %>
             </ul>
             <% if @project && @project.descendants.active.any? %>
                 <%= hidden_field_tag 'with_subprojects', 0, :id => nil %>
                 <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
             <% end %>
             <%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>
             <%= hidden_field_tag('from', params[:from]) unless params[:from].blank? %>
             <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => 'submit' %></p>
             <% end %>
             <% end %>
             <% html_title(l(:label_activity), @author) -%>

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" => "self", "href" => url_for(:params => request.query_parameters, :only_path => false, :format => 'atom')
-              xml.link    "rel" => "alternate", "href" => url_for(params.merge(:only_path => false, :format => nil, :key => nil))
+              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)
               xml.author  { xml.name "#{Setting.app_title}" }
               xml.generator(:uri => Redmine::Info.url) { xml.text! Redmine::Info.app_name; }
               @items.each do |item|
                 xml.entry do
                   url = url_for(item.event_url(:only_path => false))
                   if @project
                     xml.title truncate_single_line_raw(item.event_title, 100)
                   else
                     xml.title truncate_single_line_raw("#{item.project} - #{item.event_title}", 100)
                   end
                   xml.link "rel" => "alternate", "href" => url
                   xml.id url
                   xml.updated item.event_datetime.xmlschema
                   author = item.event_author if item.respond_to?(:event_author)
                   xml.author do
                     xml.name(author)
                     xml.email(author.mail) if author.is_a?(User) && !author.mail.blank? && !author.pref.hide_mail
                   end if author
                   xml.content "type" => "html" do
                     xml.text! textilizable(item, :event_description, :only_path => false)
                   end
                 end
               end
             end

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

             <div class="contextual">
             <%= link_to(l(:label_news_new),
                         new_project_news_path(@project),
                         :class => 'icon icon-add',
                         :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %>
             <%= watcher_link(@project.enabled_module('news'), User.current) if @project && User.current.logged? %>
             </div>
             <div id="add-news" style="display:none;">
             <h2><%=l(:label_news_new)%></h2>
             <%= labelled_form_for @news, :url => project_news_index_path(@project),
                                                        :html => { :id => 'news-form', :multipart => true } do |f| %>
             <%= render :partial => 'news/form', :locals => { :f => f } %>
             <%= submit_tag l(:button_create) %>
             <%= preview_link preview_news_path(:project_id => @project), 'news-form' %> |
             <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()' %>
             <% end if @project %>
             <div id="preview" class="wiki"></div>
             </div>
             <h2><%=l(:label_news_plural)%></h2>
             <% if @newss.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             <% @newss.each do |news| %>
                 <article class="news-article">
                   <header>
                     <h3><%= avatar(news.author, :size => "24") %><%= link_to_project(news.project) + ': ' unless news.project == @project %>
                     <%= link_to h(news.title), news_path(news) %>
                     <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %></h3>
                     <p class="author"><%= authoring news.created_on, news.author %></p>
                   </header>
                   <div class="wiki">
                   <%= textilizable(news, :description) %>
                   </div>
                 </article>
             <% end %>
             <% end %>
             <span class="pagination"><%= pagination_links_full @news_pages %></span>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %>
             <% 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 %>
             <% html_title(l(:label_news_plural)) -%>

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

             <%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
             <div class="contextual">
               <%= render :partial => 'navigation' %>
             </div>
             <h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
             <%= 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 %>
               <%= render :partial => 'common/other' %>
             <% end %>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>
             <% end %>

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

             <div class="contextual">
             <%= form_tag(
                    {:controller => 'repositories', :action => 'revision', :id => @project,
                     :repository_id => @repository.identifier_param},
                    :method => :get
                  ) do %>
               <%= l(:label_revision) %>: <%= text_field_tag 'rev', nil, :size => 8 %>
               <%= submit_tag 'OK' %>
             <% end %>
             </div>
             <h2><%= l(:label_revision_plural) %></h2>
             <%= render :partial => 'revisions',
                        :locals => {:project   => @project,
                                    :path      => '',
                                    :revisions => @changesets,
                                    :entry     => nil } %>
             <span class="pagination"><%= pagination_links_full @changeset_pages,@changeset_count %></span>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag "scm" %>
               <%= auto_discovery_link_tag(
                            :atom,
-                           params.merge(
+                           :params => request.query_parameters.merge(:page => nil, :key => User.current.rss_key),
-                             {:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
+                           :format => 'atom') %>
             <% end %>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
             <% end %>
             <% html_title(l(:label_revision_plural)) -%>

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

             <%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
             <div class="contextual">
               <%= render :partial => 'navigation' %>
             </div>
             <h2><%= render :partial => 'breadcrumbs',
                            :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
             <% if !@entries.nil? && authorize_for('repositories', 'browse') %>
               <%= render :partial => 'dir_list' %>
             <% end %>
             <%= render_properties(@properties) %>
             <% if authorize_for('repositories', 'revisions') %>
               <% if @changesets && !@changesets.empty? %>
                 <h3><%= l(:label_latest_revision_plural) %></h3>
                 <%= render :partial => 'revisions',
                           :locals => {:project => @project, :path => @path,
                                       :revisions => @changesets, :entry => nil }%>
               <% end %>
               <p>
               <% has_branches = (!@repository.branches.nil? && @repository.branches.length > 0)
                  sep = '' %>
               <% if @repository.supports_all_revisions? && @path.blank? %>
                 <%= link_to l(:label_view_all_revisions), :action => 'revisions', :id => @project,
                             :repository_id => @repository.identifier_param %>
                 <% sep = '|' %>
               <% end %>
               <% if @repository.supports_directory_revisions? &&
                      ( has_branches || !@path.blank? || !@rev.blank? ) %>
                 <%= sep %>
                 <%= link_to l(:label_view_revisions),
                                :action => 'changes',
                                :path   => to_path_param(@path),
                                :id     => @project,
                                :repository_id => @repository.identifier_param,
                                :rev    => @rev %>
               <% end %>
               </p>
               <% if @repository.supports_all_revisions? %>
                 <% content_for :header_tags do %>
                   <%= auto_discovery_link_tag(
-                               :atom, params.merge(
+                               :atom,
-                                  {:format => 'atom', :action => 'revisions',
+                               :action => 'revisions', :id => @project,
-                                   :id => @project, :page => nil, :key => User.current.rss_key})) %>
+                               :repository_id => @repository.identifier_param,
+                               :key => User.current.rss_key) %>
                <% end %>
                <% other_formats_links do |f| %>
                 <%= f.link_to 'Atom',
                               :url => {:action => 'revisions', :id => @project,
                                        :repository_id => @repository.identifier_param,
                                        :key => User.current.rss_key} %>
                 <% end %>
               <% end %>
             <% end %>
             <% if @repositories.size > 1 %>
               <% content_for :sidebar do %>
                 <h3><%= l(:label_repository_plural) %></h3>
                 <p>
                   <%= @repositories.sort.collect {|repo|
                       link_to repo.name,
                               {:controller => 'repositories', :action => 'show',
                                :id => @project, :repository_id => repo.identifier_param, :rev => nil, :path => nil},
                               :class => 'repository' + (repo == @repository ? ' selected' : '')
                     }.join('<br />').html_safe %>
                 </p>
               <% end %>
             <% end %>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag "scm" %>
             <% end %>
             <% html_title(l(:label_repository)) -%>

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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