summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-10-13 08:27:02 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-10-13 08:27:02 +0000
commitdaf2d54f27bea153c35fe822a327f797cc43782d (patch)
tree364b4dd7219fcd40d26fee4f9edfadf1f67d4ccb
parent8849727bd9ea1c4360fd5bc980a38449a2dd6b0c (diff)
downloadredmine-daf2d54f27bea153c35fe822a327f797cc43782d.tar.gz
redmine-daf2d54f27bea153c35fe822a327f797cc43782d.zip
Merged r12162 from trunk (#14902).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12213 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/models/issue.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb
index c6b2ab7da..86e456120 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -106,10 +106,10 @@ class Issue < ActiveRecord::Base
when 'all'
nil
when 'default'
- user_ids = [user.id] + user.groups.map(&:id)
+ user_ids = [user.id] + user.groups.map(&:id).compact
"(#{table_name}.is_private = #{connection.quoted_false} OR #{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))"
when 'own'
- user_ids = [user.id] + user.groups.map(&:id)
+ user_ids = [user.id] + user.groups.map(&:id).compact
"(#{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))"
else
'1=0'