jro_apps/redmine Commit - r15248:731eadc4502f

Don't generate urls with params....

Jean-Philippe Lang -

r15248:731eadc4502f

parent child

Context file:

r15248:731eadc4502f

app/helpers/calendars_helper.rb +1 -1

               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

app/helpers/gantt_helper.rb +2 -2

                 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
                 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

app/helpers/issues_helper.rb +1 -1

               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',

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

               <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>

app/views/gantts/show.html.erb +2 -2

             <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>

General Comments 0

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

No TODOs yet

	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