jro_apps/redmine Commit - r2395:e1b828de95ec

Adds ability to filter watched issues (#846)....

Jean-Philippe Lang -

r2395:e1b828de95ec

parent child

Context file:

r2395:e1b828de95ec

Expand all files

app/models/query.rb +22 -15

                 end
                 @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values } unless user_values.empty?
                 @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values } unless user_values.empty?
+                if User.current.logged?
+                  @available_filters["watcher_id"] = { :type => :list, :order => 15, :values => [["<< #{l(:label_me)} >>", "me"]] }
+                end
                 if project
                   # project specific filters
                   next if field == "subproject_id"
                   v = values_for(field).clone
                   next unless v and !v.empty?
+                  operator = operator_for(field)
+                  # "me" value subsitution
+                  if %w(assigned_to_id author_id watcher_id).include?(field)
+                    v.push(User.current.logged? ? User.current.id.to_s : "0") if v.delete("me")
+                  end
                   sql = ''
-                  is_custom_filter = false
                   if field =~ /^cf_(\d+)$/
                     # custom field
                     db_table = CustomValue.table_name
                     db_field = 'value'
                     is_custom_filter = true
                     sql << "#{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=#{$1} WHERE "
+                    sql << sql_for_field(field, operator, v, db_table, db_field, true) + ')'
+                  elsif field == 'watcher_id'
+                    db_table = Watcher.table_name
+                    db_field = 'user_id'
+                    sql << "#{Issue.table_name}.id #{ operator == '=' ? 'IN' : 'NOT IN' } (SELECT #{db_table}.watchable_id FROM #{db_table} WHERE #{db_table}.watchable_type='Issue' AND "
+                    sql << sql_for_field(field, '=', v, db_table, db_field) + ')'
                   else
                     # regular field
                     db_table = Issue.table_name
                     db_field = field
-                    sql << '('
+                    sql << '(' + sql_for_field(field, operator, v, db_table, db_field) + ')'
                   end
-                  # "me" value subsitution
-                  if %w(assigned_to_id author_id).include?(field)
-                    v.push(User.current.logged? ? User.current.id.to_s : "0") if v.delete("me")
-                  end
-                  sql = sql + sql_for_field(field, v, db_table, db_field, is_custom_filter)
-                  sql << ')'
                   filters_clauses << sql
                 end if filters and valid?
                 (filters_clauses << project_statement).join(' AND ')
               private
-              # Helper method to generate the WHERE sql for a +field+ with a +value+
+              # Helper method to generate the WHERE sql for a +field+, +operator+ and a +value+
-              def sql_for_field(field, value, db_table, db_field, is_custom_filter)
+              def sql_for_field(field, operator, value, db_table, db_field, is_custom_filter=false)
                 sql = ''
-                case operator_for field
+                case operator
                 when "="
                   sql = "#{db_table}.#{db_field} IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
                 when "!"

lang/bg.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/ca.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/cs.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/da.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/de.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/en.yml +1 0

             field_comments_sorting: Display comments
             field_parent_title: Parent page
             field_editable: Editable
+            field_watcher: Watcher
             setting_app_title: Application title
             setting_app_subtitle: Application subtitle

lang/es.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/fi.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/fr.yml +1 0

             field_parent_title: Page parent
             field_editable: Modifiable
             field_identity_url: URL OpenID
+            field_watcher: Observateur
             setting_app_title: Titre de l'application
             setting_app_subtitle: Sous-titre de l'application

lang/gl.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/he.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/hu.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/it.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/ja.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/ko.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/lt.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/mk.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/nl.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/no.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/pl.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/pt-br.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/pt.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/ro.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/ru.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/sk.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/sl.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/sr.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/sv.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/th.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/tr.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/uk.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/vn.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/zh-tw.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

lang/zh.yml +1 0

             field_identity_url: OpenID URL
             setting_openid: Allow OpenID login and registration
             label_login_with_open_id_option: or login with OpenID
+            field_watcher: Watcher

test/fixtures/watchers.yml +4 0

               watchable_type: Message
               watchable_id: 1
               user_id: 1
+            watchers_003:
+              watchable_type: Issue
+              watchable_id: 2
+              user_id: 1
   No newline at end of file

test/unit/query_test.rb +21 -1

@@ -18,7 +18,7
18	require File.dirname(__FILE__) + '/../test_helper'	18	require File.dirname(__FILE__) + '/../test_helper'
19		19
20	class QueryTest < Test::Unit::TestCase	20	class QueryTest < Test::Unit::TestCase
21	fixtures :projects, :enabled_modules, :users, :members, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :versions, :queries	21	fixtures :projects, :enabled_modules, :users, :members, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :watchers, :custom_fields, :custom_values, :versions, :queries
22		22
23	def test_custom_fields_for_all_projects_should_be_available_in_global_queries	23	def test_custom_fields_for_all_projects_should_be_available_in_global_queries
24	query = Query.new(:project => nil, :name => '_')	24	query = Query.new(:project => nil, :name => '_')
@@ -162,6 +162,26 class QueryTest < Test::Unit::TestCase
162	find_issues_with_query(query)	162	find_issues_with_query(query)
163	end	163	end
164		164
		165	def test_filter_watched_issues
		166	User.current = User.find(1)
		167	query = Query.new(:name => '_', :filters => { 'watcher_id' => {:operator => '=', :values => ['me']}})
		168	result = find_issues_with_query(query)
		169	assert_not_nil result
		170	assert !result.empty?
		171	assert_equal Issue.visible.watched_by(User.current).sort_by(&:id), result.sort_by(&:id)
		172	User.current = nil
		173	end
		174
		175	def test_filter_unwatched_issues
		176	User.current = User.find(1)
		177	query = Query.new(:name => '_', :filters => { 'watcher_id' => {:operator => '!', :values => ['me']}})
		178	result = find_issues_with_query(query)
		179	assert_not_nil result
		180	assert !result.empty?
		181	assert_equal((Issue.visible - Issue.watched_by(User.current)).sort_by(&:id).size, result.sort_by(&:id).size)
		182	User.current = nil
		183	end
		184
165	def test_default_columns	185	def test_default_columns
166	q = Query.new	186	q = Query.new
167	assert !q.columns.empty?	187	assert !q.columns.empty?

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