jro_apps/redmine Commit - r7907:69a2431dd051

Dropped TimeEntryReportsController....

Dropped TimeEntryReportsController. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8027 e93f8b46-1217-0410-a6f0-8f06a7374b81

Jean-Philippe Lang - Fri, 02 Dec 2011 19:33:05

r7907:69a2431dd051

parent child

Diff options:

Raw Diff | Patch Diff | Download Diff

Side by Side Unified

Hide whitespace changes

Show full context diff

Context file:

r7907:69a2431dd051 Loading diff...:

Collapse all files

app/controllers/timelog_controller.rb

¶ permalink

app/controllers/timelog_controller.rb +12 -2

Show file before | Show file after | Hide comments

               before_filter :find_project, :only => [:new, :create]
               before_filter :find_time_entry, :only => [:show, :edit, :update]
               before_filter :find_time_entries, :only => [:bulk_edit, :bulk_update, :destroy]
-              before_filter :authorize, :except => [:index]
+              before_filter :authorize, :except => [:index, :report]
-              before_filter :find_optional_project, :only => [:index]
+              before_filter :find_optional_project, :only => [:index, :report]
               accept_rss_auth :index
               accept_api_auth :index, :show, :create, :update, :destroy
                 end
               end
+              def report
+                retrieve_date_range
+                @report = Redmine::Helpers::TimeReport.new(@project, @issue, params[:criteria], params[:columns], @from, @to)
+                respond_to do |format|
+                  format.html { render :layout => !request.xhr? }
+                  format.csv  { send_data(report_to_csv(@report), :type => 'text/csv; header=present', :filename => 'timelog.csv') }
+                end
+              end
               def show
                 respond_to do |format|
                   # TODO: Implement html response

app/views/projects/show.html.erb

¶ permalink

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

Show file before | Show file after | Hide comments

                 <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 => 'index', :project_id => @project}) %> |
-                <%= link_to(l(:label_report), {:controller => 'time_entry_reports', :action => 'report', :project_id => @project}) %></p>
+                <%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}) %></p>
                 <% end %>
                 <%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %>
             <% end %>

app/views/timelog/_date_range.html.erb

¶ permalink

app/views/timelog/_date_range.html.erb +1 -1

Show file before | Show file after | Hide comments

             <ul>
                 <li><%= link_to(l(:label_details), url_params.merge({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue }),
                                                    :class => (@controller.action_name == 'index' ? 'selected' : nil)) %></li>
-                <li><%= link_to(l(:label_report), url_params.merge({:controller => 'time_entry_reports', :action => 'report', :project_id => @project, :issue_id => @issue}),
+                <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>

app/views/timelog/_report_criteria.html.erb

¶ permalink

app/views/timelog/_report_criteria.html.erb ~~app/views/time_entry_reports/_report_criteria.html.erb~~ renamed 0 0

Show file before | Show file after | Hide comments

NO CONTENT: file renamed from app/views/time_entry_reports/_report_criteria.html.erb to app/views/timelog/_report_criteria.html.erb

app/views/timelog/report.html.erb

¶ permalink

app/views/timelog/report.html.erb ~~app/views/time_entry_reports/report.html.erb~~ renamed +1 -1

Show file before | Show file after | Hide comments

             <h2><%= l(:label_spent_time) %></h2>
-            <% form_tag({:controller => 'time_entry_reports', :action => 'report', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
+            <% form_tag({:controller => 'timelog', :action => 'report', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
               <% @report.criteria.each do |criterion| %>
                 <%= hidden_field_tag 'criteria[]', criterion, :id => nil %>
               <% end %>

config/routes.rb

¶ permalink

config/routes.rb +4 -13

Show file before | Show file after | Hide comments

               map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow'
               map.connect 'help/:ctrl/:page', :controller => 'help'
-              map.with_options :controller => 'time_entry_reports', :action => 'report',:conditions => {:method => :get} do |time_report|
-                time_report.connect 'projects/:project_id/issues/:issue_id/time_entries/report'
-                time_report.connect 'projects/:project_id/issues/:issue_id/time_entries/report.:format'
-                time_report.connect 'projects/:project_id/time_entries/report'
-                time_report.connect 'projects/:project_id/time_entries/report.:format'
-                time_report.connect 'time_entries/report'
-                time_report.connect 'time_entries/report.:format'
-              end
               map.bulk_edit_time_entry 'time_entries/bulk_edit',
                                :controller => 'timelog', :action => 'bulk_edit', :conditions => { :method => :get }
               map.bulk_update_time_entry 'time_entries/bulk_edit',
               map.time_entries_context_menu '/time_entries/context_menu',
                                :controller => 'context_menus', :action => 'time_entries'
-              map.resources :time_entries, :controller => 'timelog'
+              map.resources :time_entries, :controller => 'timelog', :collection => {:report => :get}
               map.connect 'projects/:id/wiki', :controller => 'wikis', :action => 'edit', :conditions => {:method => :post}
               map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :get}
               end
               map.resources :issues do |issues|
-                issues.resources :time_entries, :controller => 'timelog'
+                issues.resources :time_entries, :controller => 'timelog', :collection => {:report => :get}
                 issues.resources :relations, :shallow => true, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
               end
               } do |project|
                 project.resource :project_enumerations, :as => 'enumerations', :only => [:update, :destroy]
                 project.resources :issues, :only => [:index, :new, :create] do |issues|
-                  issues.resources :time_entries, :controller => 'timelog'
+                  issues.resources :time_entries, :controller => 'timelog', :collection => {:report => :get}
                 end
                 project.resources :files, :only => [:index, :new, :create]
                 project.resources :versions, :shallow => true, :collection => {:close_completed => :put}, :member => {:status_by => :post}
                 project.resources :news, :shallow => true
-                project.resources :time_entries, :controller => 'timelog', :path_prefix => 'projects/:project_id'
+                project.resources :time_entries, :controller => 'timelog', :path_prefix => 'projects/:project_id', :collection => {:report => :get}
                 project.resources :queries, :only => [:new, :create]
                 project.resources :issue_categories, :shallow => true
                 project.resources :documents, :shallow => true, :member => {:add_attachment => :post}

lib/redmine.rb

¶ permalink

lib/redmine.rb +1 -1

Show file before | Show file after | Hide comments

               map.project_module :time_tracking do |map|
                 map.permission :log_time, {:timelog => [:new, :create]}, :require => :loggedin
-                map.permission :view_time_entries, :timelog => [:index, :show], :time_entry_reports => [:report]
+                map.permission :view_time_entries, :timelog => [:index, :report, :show]
                 map.permission :edit_time_entries, {:timelog => [:edit, :update, :destroy, :bulk_edit, :bulk_update]}, :require => :member
                 map.permission :edit_own_time_entries, {:timelog => [:edit, :update, :destroy,:bulk_edit, :bulk_update]}, :require => :loggedin
                 map.permission :manage_project_activities, {:project_enumerations => [:update, :destroy]}, :require => :member

test/functional/time_entry_reports_controller_test.rb

¶ permalink

test/functional/time_entry_reports_controller_test.rb +2 0

Show file before | Show file after | Hide comments

             require File.expand_path('../../test_helper', __FILE__)
             class TimeEntryReportsControllerTest < ActionController::TestCase
+              tests TimelogController
               fixtures :projects, :enabled_modules, :roles, :members, :member_roles,
                        :issues, :time_entries, :users, :trackers, :enumerations,
                        :issue_statuses, :custom_fields, :custom_values

test/integration/routing_test.rb

¶ permalink

test/integration/routing_test.rb +3 -5

Show file before | Show file after | Hide comments

                 should_route :put, "/projects/ecookbook/issues/234/time_entries/22", :controller => 'timelog', :action => 'update', :id => '22', :issue_id => '234', :project_id => 'ecookbook'
                 should_route :delete, "/projects/ecookbook/issues/234/time_entries/55", :controller => 'timelog', :action => 'destroy', :id => '55', :issue_id => '234', :project_id => 'ecookbook'
-              end
-              context "time_entry_reports" do
+                should_route :get, "/time_entries/report", :controller => 'timelog', :action => 'report'
-                should_route :get, "/time_entries/report", :controller => 'time_entry_reports', :action => 'report'
+                should_route :get, "/projects/567/time_entries/report", :controller => 'timelog', :action => 'report', :project_id => '567'
-                should_route :get, "/projects/567/time_entries/report", :controller => 'time_entry_reports', :action => 'report', :project_id => '567'
+                should_route :get, "/projects/567/time_entries/report.csv", :controller => 'timelog', :action => 'report', :project_id => '567', :format => 'csv'
-                should_route :get, "/projects/567/time_entries/report.csv", :controller => 'time_entry_reports', :action => 'report', :project_id => '567', :format => 'csv'
               end
               context "users" do

app/controllers/time_entry_reports_controller.rb

¶ permalink

app/controllers/time_entry_reports_controller.rb removed 0 -82

Show file before | Show file after | Hide comments

NO CONTENT: file was removed

General Comments 0

Write
Preview

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

Reviewers

TODOs Show resolved

No TODOs yet

0 0 0

Comments

No Comments 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