diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-08-26 16:37:21 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-08-26 16:37:21 +0000 |
| commit | 30821586cb31dd2af9b634477c026a817e294986 (patch) | |
| tree | 3d7de10911ed340df8edb7a946d13d40d330713f /app | |
| parent | ab1e74d16cb21ee1f7410c94538c2b6e2bdd3b5b (diff) | |
| download | redmine-30821586cb31dd2af9b634477c026a817e294986.tar.gz redmine-30821586cb31dd2af9b634477c026a817e294986.zip | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/calendars_helper.rb | 12 | ||||
| -rw-r--r-- | app/views/calendars/show.html.erb | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app/helpers/calendars_helper.rb b/app/helpers/calendars_helper.rb index 2bc028d65..88327f51c 100644 --- 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 09bf7ddf2..530416661 100644 --- 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"> |