jro_apps/redmine Commit - r3931:30821586cb31

Add the project_id to the Calendar link to month....

Eric Davis -

r3931:30821586cb31

parent child

Context file:

r3931:30821586cb31

Collapse all files

app/helpers/calendars_helper.rb +7 -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
                                               [year, month - 1]
                                             end
                 name = if target_month == 12
                          "#{month_name(target_month)} #{target_year}"
                        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
                                               [year, month + 1]
                                             end
                 name = if target_month == 1
                          "#{month_name(target_month)} #{target_year}"
                        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 + ' &#187;'),
                                {:update => "content", :url => link_target, :method => :put},
                                {:href => link_target})
               end
             end

app/views/calendars/show.html.erb +1 -1

             <h2><%= l(:label_calendar) %></h2>
             <% form_tag(calendar_path, :method => :put, :id => 'query_form') do %>
               <%= hidden_field_tag('project_id', @project.to_param) if @project%>
             <fieldset id="filters" class="collapsible">
               <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
               <div>
                 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
               </div>
             </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">
             <%= label_tag('month', l(:label_month)) %>
             <%= select_month(@month, :prefix => "month", :discard_type => true) %>
             <%= label_tag('year', l(:label_year)) %>
             <%= select_year(@year, :prefix => "year", :discard_type => true) %>
             <%= link_to_remote l(:button_apply),
                                { :url => { :set_filter => (@query.new_record? ? 1 : nil) },
                                  :update => "content",
                                  :with => "Form.serialize('query_form')"
                                }, :class => 'icon icon-checked' %>
             <%= link_to_remote l(:button_clear),
                                { :url => { :set_filter => (@query.new_record? ? 1 : nil) },
                                  :update => "content",
                                }, :class => 'icon icon-reload' if @query.new_record? %>
             </p>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %>
             <p class="legend cal">
             	<span class="starting"><%= l(:text_tip_task_begin_day) %></span>
             	<span class="ending"><%= l(:text_tip_task_end_day) %></span>
             	<span class="starting ending"><%= l(:text_tip_task_begin_end_day) %></span>
             </p>
             <% end %>
             <% content_for :sidebar do %>
                 <%= render :partial => 'issues/sidebar' %>
             <% end %>
             <% html_title(l(:label_calendar)) -%>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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