diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-07-10 17:20:28 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-07-10 17:20:28 +0000 |
| commit | 731eadc4502f7fccc85dcc2ab4c29a9da4f5a415 (patch) | |
| tree | d3f30a05d64fc6bfcef6ad6c10b6f4f75e36232c /app/helpers | |
| parent | cf62de0ff65edc734219f90d0ec64b3a8019be89 (diff) | |
| download | redmine-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/helpers')
| -rw-r--r-- | app/helpers/calendars_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/gantt_helper.rb | 4 | ||||
| -rw-r--r-- | app/helpers/issues_helper.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/calendars_helper.rb b/app/helpers/calendars_helper.rb index cb1327625..ec56abc91 100644 --- a/app/helpers/calendars_helper.rb +++ b/app/helpers/calendars_helper.rb @@ -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 diff --git a/app/helpers/gantt_helper.rb b/app/helpers/gantt_helper.rb index 3c68cadae..d49c60dd2 100644 --- a/app/helpers/gantt_helper.rb +++ b/app/helpers/gantt_helper.rb @@ -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 diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index db9483274..a276a61ff 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -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', |