mirror of
https://github.com/meineerde/redmine.git
synced 2025-10-17 17:01:01 +00:00
Add anonymous user to author list in issue/time query (#16904).
Patch by Yuichi HARADA and Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@19065 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
4a447dda09
commit
9746ab7e5b
@ -567,6 +567,7 @@ class Query < ActiveRecord::Base
|
||||
author_values = []
|
||||
author_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
|
||||
author_values += users.sort_by(&:status).collect{|s| [s.name, s.id.to_s, l("status_#{User::LABEL_BY_STATUS[s.status]}")] }
|
||||
author_values << [l(:label_user_anonymous), User.anonymous.id.to_s]
|
||||
author_values
|
||||
end
|
||||
|
||||
|
||||
@ -756,11 +756,12 @@ class QueriesControllerTest < Redmine::ControllerTest
|
||||
assert_equal 'application/json', response.content_type
|
||||
json = ActiveSupport::JSON.decode(response.body)
|
||||
|
||||
assert_equal 6, json.count
|
||||
assert_equal 7, 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 ["Anonymous", "#{User.anonymous.id}"], json
|
||||
end
|
||||
|
||||
def test_user_filter_should_return_active_and_locked_users_grouped_by_status
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user