Add the project_id to the Calendar link to month.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4045 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/calendars_helper.rb b/app/helpers/calendars_helper.rb
index 2bc028d..88327f5 100644 (file)
--- a/app/helpers/calendars_helper.rb
+++ b/app/helpers/calendars_helper.rb
@@ -1,5 +1,5 @@
 module CalendarsHelper
-  def link_to_previous_month(year, month)
+  def link_to_previous_month(year, month, options={})
     target_year, target_month = if month == 1
                                   [year - 1, 12]
                                 else
@@ -11,15 +11,16 @@ module CalendarsHelper
            else
              "#{month_name(target_month)}"
            end
-    
-    link_target = calendar_path(:year => target_year, :month => target_month)
+
+    project_id = options[:project].present? ? options[:project].to_param : nil
+    link_target = calendar_path(:year => target_year, :month => target_month, :project_id => project_id)
 
     link_to_remote(('« ' + name),
                    {:update => "content", :url => link_target, :method => :put},
                    {:href => link_target})
   end
 
-  def link_to_next_month(year, month)
+  def link_to_next_month(year, month, options={})
     target_year, target_month = if month == 12
                                   [year + 1, 1]
                                 else
@@ -32,7 +33,8 @@ module CalendarsHelper
              "#{month_name(target_month)}"
            end
 
-    link_target = calendar_path(:year => target_year, :month => target_month)
+    project_id = options[:project].present? ? options[:project].to_param : nil
+    link_target = calendar_path(:year => target_year, :month => target_month, :project_id => project_id)
 
     link_to_remote((name + ' »'), 
                    {:update => "content", :url => link_target, :method => :put},

diff --git a/app/views/calendars/show.html.erb b/app/views/calendars/show.html.erb
index 09bf7dd..5304166 100644 (file)
--- a/app/views/calendars/show.html.erb
+++ b/app/views/calendars/show.html.erb
@@ -10,7 +10,7 @@
 </fieldset>
 
 <p style="float:right;">
-  <%= link_to_previous_month(@year, @month) %> | <%= link_to_next_month(@year, @month) %>
+  <%= link_to_previous_month(@year, @month, :project => @project) %> | <%= link_to_next_month(@year, @month, :project => @project) %>
 </p>
 
 <p class="buttons">