summaryrefslogtreecommitdiffstats
path: root/app/views/activities/index.html.erb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-07-10 17:20:28 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-07-10 17:20:28 +0000
commit731eadc4502f7fccc85dcc2ab4c29a9da4f5a415 (patch)
treed3f30a05d64fc6bfcef6ad6c10b6f4f75e36232c /app/views/activities/index.html.erb
parentcf62de0ff65edc734219f90d0ec64b3a8019be89 (diff)
downloadredmine-731eadc4502f7fccc85dcc2ab4c29a9da4f5a415.tar.gz
redmine-731eadc4502f7fccc85dcc2ab4c29a9da4f5a415.zip
Don't generate urls with params.
git-svn-id: http://svn.redmine.org/redmine/trunk@15630 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/activities/index.html.erb')
-rw-r--r--app/views/activities/index.html.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb
index d3a780f0c..26613aef8 100644
--- a/app/views/activities/index.html.erb
+++ b/app/views/activities/index.html.erb
@@ -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>