Project

General

Profile

Feature #34700 ยป 0001-Allow-to-use-watch_by-filter-in-the-global-issues-li.patch

Holger Just, 2021-02-09 19:09

View differences:

app/models/query.rb
def watcher_values
watcher_values = [["<< #{l(:label_me)} >>", "me"]]
if User.current.allowed_to?(:view_issue_watchers, self.project)
if User.current.allowed_to?(:view_issue_watchers, self.project, global: true)
watcher_values +=
principals.sort_by(&:status).
collect{|s| [s.name, s.id.to_s, l("status_#{User::LABEL_BY_STATUS[s.status]}")]}
test/functional/queries_controller_test.rb
assert_include ["Dave2 Lopper2", "5", "locked"], json
assert_include ["A Team", "10", "active"], json
end
def test_watcher_filter_with_permission_should_show_members_and_groups_globally
# This user has view_issue_watchers permission
@request.session[:user_id] = 1
get(
:filter,
:params => {
:type => 'IssueQuery',
:name => 'watcher_id'
}
)
assert_response :success
assert_equal 'application/json', response.media_type
json = ActiveSupport::JSON.decode(response.body)
assert_equal 8, json.count
# "me" value should not be grouped
assert_include ["<< me >>", "me"], json
assert_include ["Dave Lopper", "3", "active"], json
assert_include ["Dave2 Lopper2", "5", "locked"], json
assert_include ["A Team", "10", "active"], json
end
end
    (1-1/1)