DEV: use argument instead of instance variable
This commit is contained in:
parent
a024e26d2d
commit
06985c8da9
|
@ -887,10 +887,12 @@ after_initialize do
|
||||||
Assignment.active_for_group(group).destroy_all
|
Assignment.active_for_group(group).destroy_all
|
||||||
end
|
end
|
||||||
|
|
||||||
add_filter_custom_filter("assigned") do |scope, filter_values|
|
add_filter_custom_filter("assigned") do |scope, filter_values, guardian|
|
||||||
|
return if !guardian.can_assign? || filter_values.blank?
|
||||||
|
|
||||||
user_or_group_name = filter_values.compact.first
|
user_or_group_name = filter_values.compact.first
|
||||||
|
|
||||||
return scope if user_or_group_name.blank?
|
return if user_or_group_name.blank?
|
||||||
|
|
||||||
if user_id = User.find_by_username(user_or_group_name)&.id
|
if user_id = User.find_by_username(user_or_group_name)&.id
|
||||||
scope.where(<<~SQL, user_id)
|
scope.where(<<~SQL, user_id)
|
||||||
|
@ -900,8 +902,6 @@ after_initialize do
|
||||||
scope.where(<<~SQL, group_id)
|
scope.where(<<~SQL, group_id)
|
||||||
topics.id IN (SELECT a.topic_id FROM assignments a WHERE a.assigned_to_id = ? AND a.assigned_to_type = 'Group' AND a.active)
|
topics.id IN (SELECT a.topic_id FROM assignments a WHERE a.assigned_to_id = ? AND a.assigned_to_type = 'Group' AND a.active)
|
||||||
SQL
|
SQL
|
||||||
else
|
|
||||||
scope
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue