| @@ -53,6 +53,6 module CalendarsHelper | |||
|
|
53 | 53 | end |
|
|
54 | 54 | |
|
|
55 | 55 | def link_to_month(link_name, year, month, options={}) |
|
|
56 | link_to(link_name, params.merge(:year => year, :month => month), options) | |
|
|
56 | link_to(link_name, {:params => request.query_parameters.merge(:year => year, :month => month)}, options) | |
|
|
57 | 57 | end |
|
|
58 | 58 | end |
| @@ -24,7 +24,7 module GanttHelper | |||
|
|
24 | 24 | when :in |
|
|
25 | 25 | if gantt.zoom < 4 |
|
|
26 | 26 | link_to l(:text_zoom_in), |
|
|
27 | params.merge(gantt.params.merge(:zoom => (gantt.zoom + 1))), | |
|
|
27 | {:params => request.query_parameters.merge(gantt.params.merge(:zoom => (gantt.zoom + 1)))}, | |
|
|
28 | 28 | :class => 'icon icon-zoom-in' |
|
|
29 | 29 | else |
|
|
30 | 30 | content_tag(:span, l(:text_zoom_in), :class => 'icon icon-zoom-in').html_safe |
| @@ -33,7 +33,7 module GanttHelper | |||
|
|
33 | 33 | when :out |
|
|
34 | 34 | if gantt.zoom > 1 |
|
|
35 | 35 | link_to l(:text_zoom_out), |
|
|
36 | params.merge(gantt.params.merge(:zoom => (gantt.zoom - 1))), | |
|
|
36 | {:params => request.query_parameters.merge(gantt.params.merge(:zoom => (gantt.zoom - 1)))}, | |
|
|
37 | 37 | :class => 'icon icon-zoom-out' |
|
|
38 | 38 | else |
|
|
39 | 39 | content_tag(:span, l(:text_zoom_out), :class => 'icon icon-zoom-out').html_safe |
| @@ -290,7 +290,7 module IssuesHelper | |||
|
|
290 | 290 | def query_links(title, queries) |
|
|
291 | 291 | return '' if queries.empty? |
|
|
292 | 292 | # links to #index on issues/show |
|
|
293 |
url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : |
|
|
|
293 | url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : {} | |
|
|
294 | 294 | |
|
|
295 | 295 | content_tag('h3', title) + "\n" + |
|
|
296 | 296 | content_tag('ul', |
| @@ -25,12 +25,12 | |||
|
|
25 | 25 | <ul class="pages"> |
|
|
26 | 26 | <li class="previous page"> |
|
|
27 | 27 | <%= link_to("\xc2\xab " + l(:label_previous), |
|
|
28 | params.merge(:from => @date_to - @days - 1), | |
|
|
28 | {:params => request.query_parameters.merge(:from => @date_to - @days - 1)}, | |
|
|
29 | 29 | :title => l(:label_date_from_to, :start => format_date(@date_to - 2*@days), :end => format_date(@date_to - @days - 1)), |
|
|
30 | 30 | :accesskey => accesskey(:previous)) %> |
|
|
31 | 31 | </li><% unless @date_to >= User.current.today %><li class="next page"> |
|
|
32 | 32 | <%= link_to(l(:label_next) + " \xc2\xbb", |
|
|
33 | params.merge(:from => @date_to + @days - 1), | |
|
|
33 | {:params => request.query_parameters.merge(:from => @date_to + @days - 1)}, | |
|
|
34 | 34 | :title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1)), |
|
|
35 | 35 | :accesskey => accesskey(:next)) %><% end %> |
|
|
36 | 36 | </li> |
| @@ -333,12 +333,12 | |||
|
|
333 | 333 | <tr> |
|
|
334 | 334 | <td style="text-align:left;"> |
|
|
335 | 335 | <%= link_to("\xc2\xab " + l(:label_previous), |
|
|
336 | params.merge(@gantt.params_previous), | |
|
|
336 | {:params => request.query_parameters.merge(@gantt.params_previous)}, | |
|
|
337 | 337 | :accesskey => accesskey(:previous)) %> |
|
|
338 | 338 | </td> |
|
|
339 | 339 | <td style="text-align:right;"> |
|
|
340 | 340 | <%= link_to(l(:label_next) + " \xc2\xbb", |
|
|
341 | params.merge(@gantt.params_next), | |
|
|
341 | {:params => request.query_parameters.merge(@gantt.params_next)}, | |
|
|
342 | 342 | :accesskey => accesskey(:next)) %> |
|
|
343 | 343 | </td> |
|
|
344 | 344 | </tr> |
General Comments 0
You need to be logged in to leave comments.
Login now