aas/additionals
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename filter type watcher to user_with_me

Browse Source
This commit is contained in:
Alexander Meindl 2022-02-01 20:31:33 +01:00
parent 467aa066bf
commit e53e10c115
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/additionals_query.rb
View File

@ -165,7 +165,7 @@ module AdditionalsQuery
if Additionals.user_with_select2?
add_available_filter 'watcher_id', order: position,
type: :watcher
type: :user_with_me
else
add_available_filter 'watcher_id', order: position,
type: :list,

2
app/views/additionals/_body_bottom.html.slim
View File

@ -13,7 +13,7 @@
multiple: true,
url: grouped_users_auto_completes_path(project_id: @project, with_ano: true, with_me: true)
= additionals_transform_to_select2 'watcher',
= additionals_transform_to_select2 'user_with_me',
format_state: 'formatNameWithIcon',
multiple: true,
url: grouped_users_auto_completes_path(project_id: @project, with_me: true)

4
lib/additionals/patches/query_patch.rb
View File

@ -23,7 +23,7 @@ module Additionals
operators_by_filter_type[:global_user] = operators_by_filter_type[:list_optional]
operators_by_filter_type[:principal] = operators_by_filter_type[:list_optional]
operators_by_filter_type[:user] = operators_by_filter_type[:list_optional]
operators_by_filter_type[:watcher] = operators_by_filter_type[:list_optional]
operators_by_filter_type[:user_with_me] = operators_by_filter_type[:list_optional]
end
class_methods do
@ -61,7 +61,7 @@ module Additionals
def initialize_user_values_for_select2(field, values)
case @available_filters[field][:type]
when :principal, :user, :assignee, :issue_assignee, :author, :watcher, :global_user, :internal_user
when :principal, :user, :assignee, :issue_assignee, :author, :user_with_me, :global_user, :internal_user
@available_filters[field][:values] = Principal.ids_to_names_with_ids values
end
end