diff options
| author | Go MAEDA <maeda@farend.jp> | 2023-04-18 12:05:49 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2023-04-18 12:05:49 +0000 |
| commit | fae39a954207bd055f4fa492b4ed08de9efbaf62 (patch) | |
| tree | c66575000c0e2b286e78a8958b49991c2bfef0f8 /app/models | |
| parent | 0e19e183b180388118feb3605e64a74f4243ff7d (diff) | |
| download | redmine-fae39a954207bd055f4fa492b4ed08de9efbaf62.tar.gz redmine-fae39a954207bd055f4fa492b4ed08de9efbaf62.zip | |
Fix "Any searchable text" filter doesn't support the project filter with the value "my projects" or "my bookmarks" (#38402).
git-svn-id: https://svn.redmine.org/redmine/trunk@22203 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/issue_query.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb index 5c66800f9..94d753603 100644 --- a/app/models/issue_query.rb +++ b/app/models/issue_query.rb @@ -784,8 +784,16 @@ class IssueQuery < Query if project projects = project_scope.where(project_statement) elsif has_filter?('project_id') + case values_for('project_id').first + when 'mine' + project_ids = User.current.projects.ids + when 'bookmarks' + project_ids = User.current.bookmarked_project_ids + else + project_ids = values_for('project_id') + end projects = project_scope.where( - sql_for_field('project_id', operator_for('project_id'), values_for('project_id'), Project.table_name, 'id') + sql_for_field('project_id', operator_for('project_id'), project_ids, Project.table_name, 'id') ) else projects = nil |