jro_apps/redmine Commit - r3960:5e1c29523003

Fixed the zoom, previous, and next links on the Gantt chart....

Eric Davis -

r3960:5e1c29523003

parent child

Context file:

r3960:5e1c29523003

app/helpers/issues_helper.rb +2 -2

                 when :in
                   if gantt.zoom < 4
                     link_to_remote(l(:text_zoom_in) + image_tag('zoom_in.png', img_attributes.merge(:alt => l(:text_zoom_in))),
-                                   {:url => gantt.params.merge(:zoom => (gantt.zoom+1)), :update => 'content'},
+                                   {:url => gantt.params.merge(:zoom => (gantt.zoom+1)), :method => :get, :update => 'content'},
                                    {:href => url_for(gantt.params.merge(:zoom => (gantt.zoom+1)))})
                   else
                     l(:text_zoom_in) +
                 when :out
                   if gantt.zoom > 1
                     link_to_remote(l(:text_zoom_out) + image_tag('zoom_out.png', img_attributes.merge(:alt => l(:text_zoom_out))),
-                                   {:url => gantt.params.merge(:zoom => (gantt.zoom-1)), :update => 'content'},
+                                   {:url => gantt.params.merge(:zoom => (gantt.zoom-1)), :method => :get, :update => 'content'},
                                    {:href => url_for(gantt.params.merge(:zoom => (gantt.zoom-1)))})
                   else
                     l(:text_zoom_out) +

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

             <table width="100%">
             <tr>
-            <td align="left"><%= link_to_remote ('&#171; ' + l(:label_previous)), {:url => @gantt.params_previous, :update => 'content', :complete => 'window.scrollTo(0,0)'}, {:href => url_for(@gantt.params_previous)} %></td>
+            <td align="left"><%= link_to_remote ('&#171; ' + l(:label_previous)), {:url => @gantt.params_previous, :method => :get, :update => 'content', :complete => 'window.scrollTo(0,0)'}, {:href => url_for(@gantt.params_previous)} %></td>
-            <td align="right"><%= link_to_remote (l(:label_next) + ' &#187;'), {:url => @gantt.params_next, :update => 'content', :complete => 'window.scrollTo(0,0)'}, {:href => url_for(@gantt.params_next)} %></td>
+            <td align="right"><%= link_to_remote (l(:label_next) + ' &#187;'), {:url => @gantt.params_next, :method => :get, :update => 'content', :complete => 'window.scrollTo(0,0)'}, {:href => url_for(@gantt.params_next)} %></td>
             </tr>
             </table>

lib/redmine/helpers/gantt.rb +7 -3

                     @date_from = Date.civil(@year_from, @month_from, 1)
                     @date_to = (@date_from >> @months) - 1
                   end
+                  def common_params
+                    { :controller => 'gantts', :action => 'show', :project_id => @project }
+                  end
                   def params
-                    { :zoom => zoom, :year => year_from, :month => month_from, :months => months }
+                    common_params.merge({  :zoom => zoom, :year => year_from, :month => month_from, :months => months })
                   end
                   def params_previous
-                    { :year => (date_from << months).year, :month => (date_from << months).month, :zoom => zoom, :months => months }
+                    common_params.merge({:year => (date_from << months).year, :month => (date_from << months).month, :zoom => zoom, :months => months })
                   end
                   def params_next
-                    { :year => (date_from >> months).year, :month => (date_from >> months).month, :zoom => zoom, :months => months }
+                    common_params.merge({:year => (date_from >> months).year, :month => (date_from >> months).month, :zoom => zoom, :months => months })
                   end
                         ### Extracted from the HTML view/helpers

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