diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-09-20 09:30:41 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-09-20 09:30:41 +0000 |
| commit | 41cbd239c44eb8f702d04a8b0ba25dfc381483ad (patch) | |
| tree | 3b6175b2d6f65bbe5e17f3370b9eb5c1cefe7629 /app/views/timelog | |
| parent | b4c55ea4dee9bf160de809a86958ddd2240b6e91 (diff) | |
| download | redmine-41cbd239c44eb8f702d04a8b0ba25dfc381483ad.tar.gz redmine-41cbd239c44eb8f702d04a8b0ba25dfc381483ad.zip | |
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
Diffstat (limited to 'app/views/timelog')
| -rw-r--r-- | app/views/timelog/_date_range.rhtml | 4 | ||||
| -rw-r--r-- | app/views/timelog/report.rhtml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/timelog/_date_range.rhtml b/app/views/timelog/_date_range.rhtml index 0375d3457..9addba930 100644 --- a/app/views/timelog/_date_range.rhtml +++ b/app/views/timelog/_date_range.rhtml @@ -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> diff --git a/app/views/timelog/report.rhtml b/app/views/timelog/report.rhtml index 2107fcf72..533467ef2 100644 --- a/app/views/timelog/report.rhtml +++ b/app/views/timelog/report.rhtml @@ -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'], |