diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-09-28 14:51:08 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-09-28 14:51:08 +0000 |
| commit | 7e7ac5340a281ed767066af0b5f4dd45a3d7076f (patch) | |
| tree | 891640b0548c0d3063daddb219006d120fa312c3 /app/models/issue_query.rb | |
| parent | 9a7fb0ad7be0ee3403f5b89eb0c16b68c991d519 (diff) | |
| download | redmine-7e7ac5340a281ed767066af0b5f4dd45a3d7076f.tar.gz redmine-7e7ac5340a281ed767066af0b5f4dd45a3d7076f.zip | |
Adds buit-in groups to give specific permissions to anonymous and non members users per project (#17976).
git-svn-id: http://svn.redmine.org/redmine/trunk@13417 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/issue_query.rb')
| -rw-r--r-- | app/models/issue_query.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb index bf90f56d1..c9115100c 100644 --- a/app/models/issue_query.rb +++ b/app/models/issue_query.rb @@ -147,6 +147,7 @@ class IssueQuery < Query end principals.uniq! principals.sort! + principals.reject! {|p| p.is_a?(GroupBuiltin)} users = principals.select {|p| p.is_a?(User)} add_available_filter "status_id", @@ -183,7 +184,7 @@ class IssueQuery < Query :type => :list_optional, :values => assigned_to_values ) unless assigned_to_values.empty? - group_values = Group.all.collect {|g| [g.name, g.id.to_s] } + group_values = Group.givable.collect {|g| [g.name, g.id.to_s] } add_available_filter("member_of_group", :type => :list_optional, :values => group_values ) unless group_values.empty? @@ -404,10 +405,10 @@ class IssueQuery < Query def sql_for_member_of_group_field(field, operator, value) if operator == '*' # Any group - groups = Group.all + groups = Group.givable operator = '=' # Override the operator since we want to find by assigned_to elsif operator == "!*" - groups = Group.all + groups = Group.givable operator = '!' # Override the operator since we want to find by assigned_to else groups = Group.where(:id => value).all |