From 21380453008798aab1286ad8842f33c81e1af3e9 Mon Sep 17 00:00:00 2001
From: Alex Shulgin <ash@commandprompt.com>
Date: Mon, 4 Mar 2013 13:01:31 -0800
Subject: [PATCH] Select user who is involved [github #3]

This adds a list to select the user(s) who are involved in the issue.
This version is incompatible with the older versions of the plugin.
The old queries using this filter need to be re-created.
---
 config/locales/en.yml                         |  3 +-
 lib/redmine_involvement_filter/query_patch.rb | 31 +++++++++----------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3fd336b..c6a1934 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,4 +1,3 @@
 # English strings go here for Rails i18n
 en:
-  field_involvement: My involvement
-  text_involved: involved
+  field_involved_users: Involved users
diff --git a/lib/redmine_involvement_filter/query_patch.rb b/lib/redmine_involvement_filter/query_patch.rb
index 67f9bf2..95df804 100644
--- a/lib/redmine_involvement_filter/query_patch.rb
+++ b/lib/redmine_involvement_filter/query_patch.rb
@@ -14,38 +14,35 @@ def available_filters_with_involvement
       available_filters_without_involvement
 
       if User.current.logged?
-        @available_filters["involvement"] = {
-          :name => l('field_involvement'),
-          :type => :list,
-          :values => [[l(:text_involved), "1"]],
-          :order => 4  # places it next to the Assignee filter
-        }
+        filter = @available_filters['involved_user_id'] = @available_filters['assigned_to_id'].dup
+        filter[:name] = l('field_involved_users')
+        filter[:type] = :list
       end
 
       @available_filters
     end
 
-    def sql_for_involvement_field(field, operator, value)
-      uid = User.current.id
+    def sql_for_involved_user_id_field(field, operator, value)
+      value.push(User.current.id.to_s) if value.delete("me") && User.current.logged?
+      user_ids = '(' + value.map(&:to_i).join(',') + ')'
+
       if operator == '='
-        op = '='
         inop = 'IN'
-        whereop = 'OR'
+        cond = 'OR'
       else
-        op = '<>'
         inop = 'NOT IN'
-        whereop = 'AND'
+        cond = 'AND'
       end
 
-      ids_sql = %(
+      issue_ids_sql = %(
 SELECT DISTINCT journalized_id
   FROM #{Journal.table_name}
  WHERE journalized_type='Issue'
-   AND user_id #{op} #{uid}
+   AND user_id IN #{user_ids}
 )
-      sql = ["#{Issue.table_name}.assigned_to_id #{op} #{uid}",
-             "#{Issue.table_name}.author_id #{op} #{uid}",
-             "#{Issue.table_name}.id #{inop} (#{ids_sql})"].join(" #{whereop} ")
+      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} ")
 
       "(#{sql})"
     end