jro_apps/redmine Commit - r8518:980b6db5c022

Adds "me" to user custom fields filters (#9923)....

Jean-Philippe Lang -

r8518:980b6db5c022

parent child

Context file:

r8518:980b6db5c022

Collapse all files

app/models/query.rb +12 -2

               def sql_for_custom_field(field, operator, value, custom_field_id)
                 db_table = CustomValue.table_name
                 db_field = 'value'
+                filter = @available_filters[field]
+                if filter && filter[:format] == 'user'
+                  if value.delete('me')
+                    value.push User.current.id.to_s
+                  end
+                end
                 "#{Issue.table_name}.id IN (SELECT #{Issue.table_name}.id FROM #{Issue.table_name} LEFT OUTER JOIN #{db_table} ON #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{custom_field_id} WHERE " +
                   sql_for_field(field, operator, value, db_table, db_field, true) + ')'
               end
                     options = { :type => :float, :order => 20 }
                   when "user", "version"
                     next unless project
-                    options = { :type => :list_optional, :values => field.possible_values_options(project), :order => 20}
+                    values = field.possible_values_options(project)
+                    if User.current.logged? && field.field_format == 'user'
+                      values.unshift ["<< #{l(:label_me)} >>", "me"]
+                    end
+                    options = { :type => :list_optional, :values => values, :order => 20}
                   else
                     options = { :type => :string, :order => 20 }
                   end
-                  @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
+                  @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name, :format => field.field_format })
                 end
               end

test/unit/query_test.rb +17 0

@@ -413,6 +413,23 class QueryTest < ActiveSupport::TestCase
413	assert !result.include?(i3)	413	assert !result.include?(i3)
414	end	414	end
415		415
		416	def test_user_custom_field_filtered_on_me
		417	User.current = User.find(2)
		418	cf = IssueCustomField.create!(:field_format => 'user', :is_for_all => true, :is_filter => true, :name => 'User custom field', :tracker_ids => [1])
		419	issue1 = Issue.create!(:project_id => 1, :tracker_id => 1, :custom_field_values => {cf.id.to_s => '2'}, :subject => 'Test', :author_id => 1)
		420	issue2 = Issue.generate!(:project_id => 1, :tracker_id => 1, :custom_field_values => {cf.id.to_s => '3'})
		421
		422	query = Query.new(:name => '_', :project => Project.find(1))
		423	filter = query.available_filters["cf_#{cf.id}"]
		424	assert_not_nil filter
		425	assert_include 'me', filter[:values].map{\|v\| v[1]}
		426
		427	query.filters = { "cf_#{cf.id}" => {:operator => '=', :values => ['me']}}
		428	result = query.issues
		429	assert_equal 1, result.size
		430	assert issue1, result.first
		431	end
		432
416	def test_filter_my_projects	433	def test_filter_my_projects
417	User.current = User.find(2)	434	User.current = User.find(2)
418	query = Query.new(:name => '_')	435	query = Query.new(:name => '_')

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