]> source.dussan.org Git - redmine.git/commitdiff
Add the project_id to the Calendar link to month.
authorEric Davis <edavis@littlestreamsoftware.com>
Thu, 26 Aug 2010 16:37:21 +0000 (16:37 +0000)
committerEric Davis <edavis@littlestreamsoftware.com>
Thu, 26 Aug 2010 16:37:21 +0000 (16:37 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4045 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/calendars_helper.rb
app/views/calendars/show.html.erb

index 2bc028d655947232075f34f78552e7c2a8f8cf55..88327f51c761449b8748fba549498985ced2b231 100644 (file)
@@ -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(('&#171; ' + 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 + ' &#187;'), 
                    {:update => "content", :url => link_target, :method => :put},
index 09bf7ddf2a16bcbaa2254180888a1c825f4550b6..5304166614f6323d6e73e989080872eb118585de 100644 (file)
@@ -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">