meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Don't generate urls with params.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15630 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-07-10 17:20:28 +00:00
parent cf62de0ff6
commit 731eadc450
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/calendars_helper.rb
View File

@ -53,6 +53,6 @@ module CalendarsHelper
end
def link_to_month(link_name, year, month, options={})
link_to(link_name, params.merge(:year => year, :month => month), options)
link_to(link_name, {:params => request.query_parameters.merge(:year => year, :month => month)}, options)
end
end

4
app/helpers/gantt_helper.rb
View File

@ -24,7 +24,7 @@ module GanttHelper
when :in
if gantt.zoom < 4
link_to l(:text_zoom_in),
params.merge(gantt.params.merge(:zoom => (gantt.zoom + 1))),
{:params => request.query_parameters.merge(gantt.params.merge(:zoom => (gantt.zoom + 1)))},
:class => 'icon icon-zoom-in'
else
content_tag(:span, l(:text_zoom_in), :class => 'icon icon-zoom-in').html_safe
@ -33,7 +33,7 @@ module GanttHelper
when :out
if gantt.zoom > 1
link_to l(:text_zoom_out),
params.merge(gantt.params.merge(:zoom => (gantt.zoom - 1))),
{:params => request.query_parameters.merge(gantt.params.merge(:zoom => (gantt.zoom - 1)))},
:class => 'icon icon-zoom-out'
else
content_tag(:span, l(:text_zoom_out), :class => 'icon icon-zoom-out').html_safe

2
app/helpers/issues_helper.rb
View File

@ -290,7 +290,7 @@ module IssuesHelper
def query_links(title, queries)
return '' if queries.empty?
# links to #index on issues/show
url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : params
url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : {}
content_tag('h3', title) + "\n" +
content_tag('ul',

4
app/views/activities/index.html.erb
View File

@ -25,12 +25,12 @@
<ul class="pages">
<li class="previous page">
<%= link_to("\xc2\xab " + l(:label_previous),
params.merge(:from => @date_to - @days - 1),
{: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.merge(:from => @date_to + @days - 1),
{: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>

4
app/views/gantts/show.html.erb
View File

@ -333,12 +333,12 @@
<tr>
<td style="text-align:left;">
<%= link_to("\xc2\xab " + l(:label_previous),
params.merge(@gantt.params_previous),
{:params => request.query_parameters.merge(@gantt.params_previous)},
:accesskey => accesskey(:previous)) %>
</td>
<td style="text-align:right;">
<%= link_to(l(:label_next) + " \xc2\xbb",
params.merge(@gantt.params_next),
{:params => request.query_parameters.merge(@gantt.params_next)},
:accesskey => accesskey(:next)) %>
</td>
</tr>