jro_apps/redmine Commit - r15264:539166597f99

Adds a version filter on time entries (#13558)....

Jean-Philippe Lang -

r15264:539166597f99

parent child

Context file:

r15264:539166597f99

Collapse all files

app/models/query.rb +2 -2

                   if field =~ /cf_(\d+)$/
                     # custom field
                     filters_clauses << sql_for_custom_field(field, operator, v, $1)
-                  elsif respond_to?("sql_for_#{field}_field")
+                  elsif respond_to?(method = "sql_for_#{field.gsub('.','_')}_field")
                     # specific statement
-                    filters_clauses << send("sql_for_#{field}_field", field, operator, v)
+                    filters_clauses << send(method, field, operator, v)
                   else
                     # regular field
                     filters_clauses << '(' + sql_for_field(field, operator, v, queried_table_name, field) + ')'

app/models/time_entry_query.rb +24 0

                 add_available_filter "spent_on", :type => :date_past
                 principals = []
+                versions = []
                 if project
                   principals += project.principals.visible.sort
                   unless project.leaf?
                       principals += Principal.member_of(subprojects).visible
                     end
                   end
+                  versions = project.shared_versions.to_a
                 else
                   if all_projects.any?
                     # members of visible projects
                 end
                 add_available_filter("issue_id", :type => :tree, :label => :label_issue)
+                add_available_filter("issue.fixed_version_id",
+                  :type => :list,
+                  :name => l("label_attribute_of_issue", :name => l(:field_fixed_version)),
+                  :values => Version.sort_by_status(versions).collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s, l("version_status_#{s.status}")] })
                 principals.uniq!
                 principals.sort!
                 end
               end
+              def sql_for_issue_fixed_version_id_field(field, operator, value)
+                issue_ids = Issue.where(:fixed_version_id => value.first.to_i).pluck(:id)
+                case operator
+                when "="
+                  if issue_ids.any?
+                    "#{TimeEntry.table_name}.issue_id IN (#{issue_ids.join(',')})"
+                  else
+                    "1=0"
+                  end
+                when "!"
+                  if issue_ids.any?
+                    "#{TimeEntry.table_name}.issue_id NOT IN (#{issue_ids.join(',')})"
+                  else
+                    "1=1"
+                  end
+                end
+              end
               def sql_for_activity_id_field(field, operator, value)
                 condition_on_id = sql_for_field(field, operator, value, Enumeration.table_name, 'id')
                 condition_on_parent_id = sql_for_field(field, operator, value, Enumeration.table_name, 'parent_id')

test/functional/timelog_controller_test.rb +21 0

@@ -639,6 +639,27 class TimelogControllerTest < ActionController::TestCase
639	end	639	end
640	end	640	end
641		641
		642	def test_index_at_project_level_with_issue_id_short_filter
		643	issue = Issue.generate!(:project_id => 1)
		644	TimeEntry.generate!(:issue => issue, :hours => 4)
		645	TimeEntry.generate!(:issue => issue, :hours => 3)
		646	@request.session[:user_id] = 2
		647
		648	get :index, :project_id => 'ecookbook', :issue_id => issue.id.to_s, :set_filter => 1
		649	assert_select '.total-hours', :text => 'Total time: 7.00 hours'
		650	end
		651
		652	def test_index_at_project_level_with_issue_fixed_version_id_short_filter
		653	version = Version.generate!(:project_id => 1)
		654	issue = Issue.generate!(:project_id => 1, :fixed_version => version)
		655	TimeEntry.generate!(:issue => issue, :hours => 2)
		656	TimeEntry.generate!(:issue => issue, :hours => 3)
		657	@request.session[:user_id] = 2
		658
		659	get :index, :project_id => 'ecookbook', :"issue.fixed_version_id" => version.id.to_s, :set_filter => 1
		660	assert_select '.total-hours', :text => 'Total time: 5.00 hours'
		661	end
		662
642	def test_index_at_project_level_with_date_range	663	def test_index_at_project_level_with_date_range
643	get :index, :project_id => 'ecookbook',	664	get :index, :project_id => 'ecookbook',
644	:f => ['spent_on'],	665	:f => ['spent_on'],

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