meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-31 11:37:14 +00:00
Code Issues Releases Wiki Activity

Fixes issue list filter "Watched by: me" only shows issues watched via group for projects with the @view_issue_watchers@ permission (#40412).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/trunk@22819 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2024-05-11 08:35:27 +00:00
parent 6d89e6a9ed
commit 47099ccd3a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/issue_query.rb
View File

@ -551,7 +551,9 @@ class IssueQuery < Query
def sql_for_watcher_id_field(field, operator, value)
db_table = Watcher.table_name
me, others = value.partition {|id| ['0', User.current.id.to_s].include?(id)}
me_ids = [0, User.current.id]
me_ids = me_ids.concat(User.current.groups.pluck(:id))
me, others = value.partition {|id| me_ids.include?(id.to_i)}
sql =
if others.any?
"SELECT #{Issue.table_name}.id FROM #{Issue.table_name} " +

11
test/unit/query_test.rb
View File

@ -1376,7 +1376,7 @@ class QueryTest < ActiveSupport::TestCase
assert_equal Project.where(parent_id: bookmarks).ids.sort, result.map(&:id).sort
end
def test_filter_watched_issues
def test_filter_watched_issues_by_user
User.current = User.find(1)
query =
IssueQuery.new(
@ -1384,7 +1384,7 @@ class QueryTest < ActiveSupport::TestCase
:filters => {
'watcher_id' => {
:operator => '=',
:values => ['me']
:values => [User.current.id]
}
}
)
@ -1394,13 +1394,17 @@ class QueryTest < ActiveSupport::TestCase
assert_equal Issue.visible.watched_by(User.current).sort_by(&:id), result.sort_by(&:id)
end
def test_filter_watched_issues_with_groups_also
def test_filter_watched_issues_by_me_should_include_user_groups
user = User.find(2)
group = Group.find(10)
group.users << user
Issue.find(3).add_watcher(user)
Issue.find(7).add_watcher(group)
manager = Role.find(1)
# view_issue_watchers permission is not required to see watched issues by current user or user groups
manager.remove_permission! :view_issue_watchers
User.current = user
query =
IssueQuery.new(
:name => '_',
@ -1412,6 +1416,7 @@ class QueryTest < ActiveSupport::TestCase
}
)
result = find_issues_with_query(query)
assert_not_nil result
assert !result.empty?
assert_equal [3, 7], result.sort_by(&:id).pluck(:id)