Update issue_query_patch.rb

gluesys · May 8, 2020 · 559cfc4 · 559cfc4
1 parent 1246025
commit 559cfc4
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/lib/custom_users_as_assignees/issue_query_patch.rb b/lib/custom_users_as_assignees/issue_query_patch.rb
@@ -3,7 +3,8 @@ module IssueQueryPatch
     def self.included(base)      
       base.send :include, InstanceMethods
       base.class_eval do
-        alias_method_chain :initialize_available_filters, :extra_filters
+        alias_method :initialize_available_filters_without_extra_filters, :initialize_available_filters
+        alias_method :initialize_available_filters, :initialize_available_filters_with_extra_filters
       end
     end
 
@@ -47,13 +48,14 @@ def sql_for_assigned_to_id_field(field, operator, value)
         end
 
         int_values = targets.to_s.scan(/[+-]?\d+/).map(&:to_i).join(",")
+        str_values = targets.to_s.scan(/[+-]?\d+/).map(&:to_i).map{ |e| "'#{e}'" }.join(",")
         if int_values.present?
           subquery = "#{Issue.table_name}.id #{ operator == '=' ? 'IN' : 'NOT IN' } "
-          subquery += "(SELECT #{Issue.table_name}.id FROM issues" + 
-            " LEFT OUTER JOIN custom_values ON custom_values.customized_id = issues.id AND custom_values.customized_type = 'Issue'" + 
-            " LEFT OUTER JOIN custom_fields ON custom_fields.id = custom_values.custom_field_id" + 
+          subquery += "(SELECT #{Issue.table_name}.id FROM issues" +
+            " LEFT OUTER JOIN custom_values ON custom_values.customized_id = issues.id AND custom_values.customized_type = 'Issue'" +
+            " LEFT OUTER JOIN custom_fields ON custom_fields.id = custom_values.custom_field_id" +
             " WHERE issues.assigned_to_id IN (#{int_values})" +
-            " OR (custom_fields.field_format = 'user' AND custom_values.value IN (#{int_values}) ) )"
+            " OR (custom_fields.field_format = 'user' AND custom_values.value IN (#{str_values}) ) )"
         end
       end