jro_apps/redmine Commit - r1777:696d21f8c8c8

Adds cross-project time reports support (#994)....

Jean-Philippe Lang -

r1777:696d21f8c8c8

parent child

Context file:

r1777:696d21f8c8c8

Collapse all files

app/controllers/application.rb +5 -1

                 end
                 true
               end
+              def deny_access
+                User.current.logged? ? render_403 : require_login
+              end
               # Authorize the user for the requested action
               def authorize(ctrl = params[:controller], action = params[:action])
                 allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project)
-                allowed ? true : (User.current.logged? ? render_403 : require_login)
+                allowed ? true : deny_access
               end
               # make sure that the user is a member of the project (or admin) if project is private

app/controllers/timelog_controller.rb +29 -11

             class TimelogController < ApplicationController
               menu_item :issues
-              before_filter :find_project, :authorize
+              before_filter :find_project, :authorize, :only => [:edit, :destroy]
+              before_filter :find_optional_project, :only => [:report, :details]
               verify :method => :post, :only => :destroy, :redirect_to => { :action => :details }
                                        }
                 # Add list and boolean custom fields as available criterias
-                @project.all_issue_custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
+                custom_fields = (@project.nil? ? IssueCustomField.for_all : @project.all_issue_custom_fields)
+                custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
                   @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Issue' AND c.customized_id = #{Issue.table_name}.id)",
                                                          :format => cf.field_format,
                                                          :label => cf.name}
-                end
+                end if @project
                 # Add list and boolean time entry custom fields
                 TimeEntryCustomField.find(:all).select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
                   sql << " FROM #{TimeEntry.table_name}"
                   sql << " LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
                   sql << " LEFT JOIN #{Project.table_name} ON #{TimeEntry.table_name}.project_id = #{Project.table_name}.id"
-                  sql << " WHERE (%s)" % @project.project_condition(Setting.display_subprojects_issues?)
+                  sql << " WHERE"
-                  sql << " AND (%s)" % Project.allowed_to_condition(User.current, :view_time_entries)
+                  sql << " (%s) AND" % @project.project_condition(Setting.display_subprojects_issues?) if @project
-                  sql << " AND spent_on BETWEEN '%s' AND '%s'" % [ActiveRecord::Base.connection.quoted_date(@from.to_time), ActiveRecord::Base.connection.quoted_date(@to.to_time)]
+                  sql << " (%s) AND" % Project.allowed_to_condition(User.current, :view_time_entries)
+                  sql << " (spent_on BETWEEN '%s' AND '%s')" % [ActiveRecord::Base.connection.quoted_date(@from.to_time), ActiveRecord::Base.connection.quoted_date(@to.to_time)]
                   sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek, spent_on"
                   @hours = ActiveRecord::Base.connection.select_all(sql)
                 sort_update
                 cond = ARCondition.new
-                cond << (@issue.nil? ? @project.project_condition(Setting.display_subprojects_issues?) :
+                if @project.nil?
-                                       ["#{TimeEntry.table_name}.issue_id = ?", @issue.id])
+                  cond << Project.allowed_to_condition(User.current, :view_time_entries)
+                elsif @issue.nil?
+                  cond << @project.project_condition(Setting.display_subprojects_issues?)
+                else
+                  cond << ["#{TimeEntry.table_name}.issue_id = ?", @issue.id]
+                end
                 retrieve_date_range
                 cond << ['spent_on BETWEEN ? AND ?', @from, @to]
                 @time_entry.destroy
                 flash[:notice] = l(:notice_successful_delete)
                 redirect_to :back
-              rescue RedirectBackError
+              rescue ::ActionController::RedirectBackError
                 redirect_to :action => 'details', :project_id => @time_entry.project
               end
                 render_404
               end
+              def find_optional_project
+                if !params[:issue_id].blank?
+                  @issue = Issue.find(params[:issue_id])
+                  @project = @issue.project
+                elsif !params[:project_id].blank?
+                  @project = Project.find(params[:project_id])
+                end
+                deny_access unless User.current.allowed_to?(:view_time_entries, @project, :global => true)
+              end
               # Retrieves the date range based on predefined ranges or specific from/to param dates
               def retrieve_date_range
                 @free_period = false
                 end
                 @from, @to = @to, @from if @from && @to && @from > @to
-                @from ||= (TimeEntry.minimum(:spent_on, :include => :project, :conditions => @project.project_condition(Setting.display_subprojects_issues?)) || Date.today) - 1
+                @from ||= (TimeEntry.minimum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries)) || Date.today) - 1
-                @to   ||= (TimeEntry.maximum(:spent_on, :include => :project, :conditions => @project.project_condition(Setting.display_subprojects_issues?)) || Date.today)
+                @to   ||= (TimeEntry.maximum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries)) || Date.today)
               end
             end

app/helpers/timelog_helper.rb +8 0

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module TimelogHelper
+              def render_timelog_breadcrumb
+                links = []
+                links << link_to(l(:label_project_all), {:project_id => nil, :issue_id => nil})
+                links << link_to(h(@project), {:project_id => @project, :issue_id => nil}) if @project
+                links << link_to_issue(@issue) if @issue
+                breadcrumb links
+              end
               def activity_collection_for_select_options
                 activities = Enumeration::get_values('ACTI')
                 collection = []

app/models/user.rb +1 -1

                 elsif options[:global]
                   # authorize if user has at least one role that has this permission
                   roles = memberships.collect {|m| m.role}.uniq
-                  roles.detect {|r| r.allowed_to?(action)}
+                  roles.detect {|r| r.allowed_to?(action)} || (self.logged? ? Role.non_member.allowed_to?(action) : Role.anonymous.allowed_to?(action))
                 else
                   false
                 end

app/views/timelog/details.rhtml +2 -4

             <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time' %>
             </div>
-            <h2><%= l(:label_spent_time) %></h2>
+            <%= render_timelog_breadcrumb %>
-            <% if @issue %>
+            <h2><%= l(:label_spent_time) %></h2>
-            <h3><%= link_to(@project.name, {:action => 'details', :project_id => @project}) %> / <%= link_to_issue(@issue) %></h3>
-            <% end %>
             <% form_remote_tag( :url => {}, :method => :get, :update => 'content' ) do %>
             <%= hidden_field_tag 'project_id', params[:project_id] %>

app/views/timelog/report.rhtml +2 0

             <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time' %>
             </div>
+            <%= render_timelog_breadcrumb %>
             <h2><%= l(:label_spent_time) %></h2>
             <% form_remote_tag(:url => {}, :update => 'content') do %>

config/routes.rb +1 -1

               map.connect 'projects/:project_id/news/:action', :controller => 'news'
               map.connect 'projects/:project_id/documents/:action', :controller => 'documents'
               map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'
-              map.connect 'projects/:project_id/timelog/:action/:id', :controller => 'timelog'
+              map.connect 'projects/:project_id/timelog/:action/:id', :controller => 'timelog', :project_id => /.+/
               map.connect 'boards/:board_id/topics/:action/:id', :controller => 'messages'
               map.with_options :controller => 'repositories' do |omap|

test/functional/timelog_controller_test.rb +52 -2

@@ -78,7 +78,7 class TimelogControllerTest < Test::Unit::TestCase
78	assert_equal 2, entry.user_id	78	assert_equal 2, entry.user_id
79	end	79	end
80		80
81	def destroy	81	def test_destroy
82	@request.session[:user_id] = 2	82	@request.session[:user_id] = 2
83	post :destroy, :id => 1	83	post :destroy, :id => 1
84	assert_redirected_to 'projects/ecookbook/timelog/details'	84	assert_redirected_to 'projects/ecookbook/timelog/details'
@@ -91,6 +91,29 class TimelogControllerTest < Test::Unit::TestCase
91	assert_template 'report'	91	assert_template 'report'
92	end	92	end
93		93
		94	def test_report_all_projects
		95	get :report
		96	assert_response :success
		97	assert_template 'report'
		98	end
		99
		100	def test_report_all_projects_denied
		101	r = Role.anonymous
		102	r.permissions.delete(:view_time_entries)
		103	r.permissions_will_change!
		104	r.save
		105	get :report
		106	assert_redirected_to '/account/login'
		107	end
		108
		109	def test_report_all_projects_one_criteria
		110	get :report, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criterias => ['project']
		111	assert_response :success
		112	assert_template 'report'
		113	assert_not_nil assigns(:total_hours)
		114	assert_equal "8.65", "%.2f" % assigns(:total_hours)
		115	end
		116
94	def test_report_all_time	117	def test_report_all_time
95	get :report, :project_id => 1, :criterias => ['project', 'issue']	118	get :report, :project_id => 1, :criterias => ['project', 'issue']
96	assert_response :success	119	assert_response :success
@@ -148,7 +171,18 class TimelogControllerTest < Test::Unit::TestCase
148	assert_not_nil assigns(:total_hours)	171	assert_not_nil assigns(:total_hours)
149	assert_equal "0.00", "%.2f" % assigns(:total_hours)	172	assert_equal "0.00", "%.2f" % assigns(:total_hours)
150	end	173	end
151		174
		175	def test_report_all_projects_csv_export
		176	get :report, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", :criterias => ["project", "member", "activity"], :format => "csv"
		177	assert_response :success
		178	assert_equal 'text/csv', @response.content_type
		179	lines = @response.body.chomp.split("\n")
		180	# Headers
		181	assert_equal 'Project,Member,Activity,2007-1,2007-2,2007-3,2007-4,2007-5,2007-6,Total', lines.first
		182	# Total row
		183	assert_equal 'Total,"","","","",154.25,8.65,"","",162.90', lines.last
		184	end
		185
152	def test_report_csv_export	186	def test_report_csv_export
153	get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", :criterias => ["project", "member", "activity"], :format => "csv"	187	get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", :criterias => ["project", "member", "activity"], :format => "csv"
154	assert_response :success	188	assert_response :success
@@ -159,6 +193,14 class TimelogControllerTest < Test::Unit::TestCase
159	# Total row	193	# Total row
160	assert_equal 'Total,"","","","",154.25,8.65,"","",162.90', lines.last	194	assert_equal 'Total,"","","","",154.25,8.65,"","",162.90', lines.last
161	end	195	end
		196
		197	def test_details_all_projects
		198	get :details
		199	assert_response :success
		200	assert_template 'details'
		201	assert_not_nil assigns(:total_hours)
		202	assert_equal "162.90", "%.2f" % assigns(:total_hours)
		203	end
162		204
163	def test_details_at_project_level	205	def test_details_at_project_level
164	get :details, :project_id => 1	206	get :details, :project_id => 1
@@ -218,6 +260,14 class TimelogControllerTest < Test::Unit::TestCase
218	assert assigns(:items).first.is_a?(TimeEntry)	260	assert assigns(:items).first.is_a?(TimeEntry)
219	end	261	end
220		262
		263	def test_details_all_projects_csv_export
		264	get :details, :format => 'csv'
		265	assert_response :success
		266	assert_equal 'text/csv', @response.content_type
		267	assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment\n")
		268	assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\"\n")
		269	end
		270
221	def test_details_csv_export	271	def test_details_csv_export
222	get :details, :project_id => 1, :format => 'csv'	272	get :details, :project_id => 1, :format => 'csv'
223	assert_response :success	273	assert_response :success

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