Makes timelog report work at issue level (#2935).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2893 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -27,9 +27,9 @@
|
||||
<div class="tabs">
|
||||
<% url_params = @free_period ? { :from => @from, :to => @to } : { :period => params[:period] } %>
|
||||
<ul>
|
||||
<li><%= link_to(l(:label_details), url_params.merge({:controller => 'timelog', :action => 'details', :project_id => @project }),
|
||||
<li><%= link_to(l(:label_details), url_params.merge({:controller => 'timelog', :action => 'details', :project_id => @project, :issue_id => @issue }),
|
||||
:class => (@controller.action_name == 'details' ? 'selected' : nil)) %></li>
|
||||
<li><%= link_to(l(:label_report), url_params.merge({:controller => 'timelog', :action => 'report', :project_id => @project}),
|
||||
<li><%= link_to(l(:label_report), url_params.merge({:controller => 'timelog', :action => 'report', :project_id => @project, :issue_id => @issue}),
|
||||
:class => (@controller.action_name == 'report' ? 'selected' : nil)) %></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
<% end %>
|
||||
<%# TODO: get rid of the project_id field, that should already be in the URL %>
|
||||
<%= hidden_field_tag('project_id', params[:project_id]) if @project %>
|
||||
<%= hidden_field_tag('issue_id', params[:issue_id]) if @issue %>
|
||||
<%= render :partial => 'date_range' %>
|
||||
|
||||
<p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
|
||||
|
||||
Reference in New Issue
Block a user