Skip to content

Commit

Permalink
Select user who is involved [github #3]
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ashcmd committed Mar 4, 2013
1 parent 37b13be commit 2138045
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 19 deletions.
3 changes: 1 addition & 2 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# English strings go here for Rails i18n
en:
field_involvement: My involvement
text_involved: involved
field_involved_users: Involved users
31 changes: 14 additions & 17 deletions lib/redmine_involvement_filter/query_patch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2138045

Please sign in to comment.