diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-10-05 16:07:17 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-10-05 16:07:17 +0000 |
| commit | e13790c62c800a5b6d9528b5e2db2aad2c5e3710 (patch) | |
| tree | 7be0ed076c62d3267a0f7839e07a6fcec011e533 /app/views | |
| parent | a034172b24cde31bac0f18b842db8c76cfb80bb1 (diff) | |
| download | redmine-e13790c62c800a5b6d9528b5e2db2aad2c5e3710.tar.gz redmine-e13790c62c800a5b6d9528b5e2db2aad2c5e3710.zip | |
Refactor: extract TimelogController#report to a new controller class
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4232 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/show.rhtml | 2 | ||||
| -rw-r--r-- | app/views/time_entry_reports/_report_criteria.rhtml (renamed from app/views/timelog/_report_criteria.rhtml) | 0 | ||||
| -rw-r--r-- | app/views/time_entry_reports/report.rhtml (renamed from app/views/timelog/report.rhtml) | 2 | ||||
| -rw-r--r-- | app/views/timelog/_date_range.rhtml | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml index cf3814b77..80e45adf0 100644 --- a/app/views/projects/show.rhtml +++ b/app/views/projects/show.rhtml @@ -68,7 +68,7 @@ <h3><%= l(:label_spent_time) %></h3> <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p> <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'details', :project_id => @project}) %> | - <%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}) %></p> + <%= link_to(l(:label_report), {:controller => 'time_entry_reports', :action => 'report', :project_id => @project}) %></p> <% end %> <%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %> <% end %> diff --git a/app/views/timelog/_report_criteria.rhtml b/app/views/time_entry_reports/_report_criteria.rhtml index c9a1cfb45..c9a1cfb45 100644 --- a/app/views/timelog/_report_criteria.rhtml +++ b/app/views/time_entry_reports/_report_criteria.rhtml diff --git a/app/views/timelog/report.rhtml b/app/views/time_entry_reports/report.rhtml index 533467ef2..0d28d5dc7 100644 --- a/app/views/timelog/report.rhtml +++ b/app/views/time_entry_reports/report.rhtml @@ -13,7 +13,7 @@ <%# 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' %> + <%= render :partial => 'timelog/date_range' %> <p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'], [l(:label_month), 'month'], diff --git a/app/views/timelog/_date_range.rhtml b/app/views/timelog/_date_range.rhtml index 2482a9fc3..041e5587f 100644 --- a/app/views/timelog/_date_range.rhtml +++ b/app/views/timelog/_date_range.rhtml @@ -30,7 +30,7 @@ <ul> <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, :issue_id => @issue}), + <li><%= link_to(l(:label_report), url_params.merge({:controller => 'time_entry_reports', :action => 'report', :project_id => @project, :issue_id => @issue}), :class => (@controller.action_name == 'report' ? 'selected' : nil)) %></li> </ul> </div> |