Added issues I am watching to the involvement filter

README.rdoc

@@ -6,7 +6,7 @@ For Redmine versions prior to 2.x, check out the pre-2.x branch.
 
 A user is involved in the issue if he/she either is the author of the
 issue, or is assigned to the issue or has updated the issue at least
-once.
+once or is watching the issue.
 
 Adds "My involvement" filter for issue queries with a bool option:
 either "is involved" or "is not involved".

init.rb

@@ -10,7 +10,7 @@
 end
 
 prepare_block = Proc.new do
-  Query.send(:include, RedmineInvolvementFilter::QueryPatch)
+  IssueQuery.send(:include, RedmineInvolvementFilter::IssueQueryPatch)
 end
 
 if Rails.env.development?

lib/redmine_involvement_filter/query_patch.rb → lib/redmine_involvement_filter/issue_query_patch.rb

@@ -1,5 +1,5 @@
 module RedmineInvolvementFilter
-  module QueryPatch
+  module IssueQueryPatch
     unloadable
 
     def self.included(base)
@@ -34,15 +34,23 @@ def sql_for_involved_user_id_field(field, operator, value)
         cond = 'AND'
       end
 
-      issue_ids_sql = %(
+      journalized_issue_ids_sql = %(
 SELECT DISTINCT journalized_id
   FROM #{Journal.table_name}
  WHERE journalized_type='Issue'
    AND user_id IN #{user_ids}
 )
+      watched_issue_ids_sql = %(
+SELECT DISTINCT watchable_id
+  FROM #{Watcher.table_name}
+ WHERE watchable_type='Issue'
+   AND user_id IN #{user_ids}
+)
+
       sql = ["#{Issue.table_name}.assigned_to_id #{inop} #{user_ids}",
              "#{Issue.table_name}.author_id #{inop} #{user_ids}",
-             "#{Issue.table_name}.id #{inop} (#{issue_ids_sql})"].join(" #{cond} ")
+             "#{Issue.table_name}.id #{inop} (#{journalized_issue_ids_sql})",
+             "#{Issue.table_name}.id #{inop} (#{watched_issue_ids_sql})"].join(" #{cond} ")
 
       "(#{sql})"
     end