diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2019-11-10 07:58:57 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2019-11-10 07:58:57 +0000 |
| commit | 9746ab7e5be2db5e2d233ee37365cf21ba4b893a (patch) | |
| tree | b33ac7141ab18a8a887e052b9abca920bccdd0de | |
| parent | 4a447dda0988c52e3c552f1e8f08a9bd1c315a2b (diff) | |
| download | redmine-9746ab7e5be2db5e2d233ee37365cf21ba4b893a.tar.gz redmine-9746ab7e5be2db5e2d233ee37365cf21ba4b893a.zip | |
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
| -rw-r--r-- | app/models/query.rb | 1 | ||||
| -rw-r--r-- | test/functional/queries_controller_test.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/query.rb b/app/models/query.rb index 5daf36e84..93c36887a 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -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 diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb index 95afdbe4e..335632cba 100644 --- a/test/functional/queries_controller_test.rb +++ b/test/functional/queries_controller_test.rb @@ -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 |