correct filter search depending on object and add wrapper for dialog

opf · Dec 2, 2024 · 39eee13 · 39eee13
1 parent 4c86ff7
commit 39eee13
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/app/forms/custom_fields/inputs/base/autocomplete/user_query_utils.rb b/app/forms/custom_fields/inputs/base/autocomplete/user_query_utils.rb
@@ -51,10 +51,17 @@ def search_key
   end
 
   def filters
-    [
+    filters = [
       { name: "type", operator: "=", values: ["User", "Group", "PlaceholderUser"] },
-      { name: "member", operator: "=", values: [@object.id.to_s] },
       { name: "status", operator: "!", values: [Principal.statuses["locked"].to_s] }
     ]
+
+    if @object.is_a?(Project)
+      filters << { name: "member", operator: "=", values: [@object.id.to_s] }
+    elsif @object.respond_to?(:project_id)
+      filters << { name: "member", operator: "=", values: [@object.project_id.to_s] }
+    end
+
+    filters
   end
 end
diff --git a/modules/costs/app/components/time_entries/time_entry_form.rb b/modules/costs/app/components/time_entries/time_entry_form.rb
@@ -23,6 +23,10 @@ class TimeEntryForm < ApplicationForm
       render_custom_fields(form: f)
     end
 
+    def additional_custom_field_input_arguments
+      { wrapper_id: "time-entry-dialog" }
+    end
+
     private
 
     delegate :project, :work_package, to: :model