kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Eric Davis 2010-08-26 16:37:21 +00:00
parent ab1e74d16c
commit 30821586cb
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/helpers/calendars_helper.rb
View File

@ -1,5 +1,5 @@
module CalendarsHelper module CalendarsHelper
def link_to_previous_month(year, month) def link_to_previous_month(year, month, options={})
target_year, target_month = if month == 1 target_year, target_month = if month == 1
[year - 1, 12] [year - 1, 12]
else else
@ -12,14 +12,15 @@ module CalendarsHelper
"#{month_name(target_month)}" "#{month_name(target_month)}"
end 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), link_to_remote(('« ' + name),
{:update => "content", :url => link_target, :method => :put}, {:update => "content", :url => link_target, :method => :put},
{:href => link_target}) {:href => link_target})
end end
def link_to_next_month(year, month) def link_to_next_month(year, month, options={})
target_year, target_month = if month == 12 target_year, target_month = if month == 12
[year + 1, 1] [year + 1, 1]
else else
@ -32,7 +33,8 @@ module CalendarsHelper
"#{month_name(target_month)}" "#{month_name(target_month)}"
end 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 + ' »'), link_to_remote((name + ' »'),
{:update => "content", :url => link_target, :method => :put}, {:update => "content", :url => link_target, :method => :put},

2
app/views/calendars/show.html.erb
View File

@ -10,7 +10,7 @@
</fieldset> </fieldset>
<p style="float:right;"> <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>
<p class="buttons"> <p class="buttons">