UDF & Reference Filterset Change (#1064)

* fix udf binding list bug * update reference filterset --------- Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>
shapiromatron · Jul 2, 2024 · 876a8ae · 876a8ae
1 parent d310714
commit 876a8ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/hawc/apps/lit/filterset.py b/hawc/apps/lit/filterset.py
@@ -191,8 +191,7 @@ def filter_my_tags(self, queryset, name, value):
                 queryset = queryset.annotate(
                     user_tag_count=Count(
                         "user_tags",
-                        filter=Q(user_tags__is_resolved=False)
-                        & Q(user_tags__user=self.request.user),
+                        Q(user_tags__user=self.request.user),
                     )
                 ).filter(user_tag_count=0)
             else:
@@ -205,7 +204,6 @@ def filter_my_tags(self, queryset, name, value):
                     mytag_count=Count(
                         "user_tags",
                         filter=Q(user_tags__tags__in=tag_ids)
-                        & Q(user_tags__is_resolved=False)
                         & Q(user_tags__user=self.request.user),
                     )
                 ).filter(mytag_count__gt=0)
@@ -217,7 +215,7 @@ def filter_anything_tagged_me(self, queryset, name, value):
         queryset = queryset.annotate(
             my_tag_count=Count(
                 "user_tags",
-                filter=Q(user_tags__is_resolved=False) & Q(user_tags__user=self.request.user),
+                Q(user_tags__user=self.request.user),
             )
         ).filter(my_tag_count__gt=0)
         return queryset.distinct()

diff --git a/hawc/apps/udf/models.py b/hawc/apps/udf/models.py
@@ -115,7 +115,7 @@ def form_field(self, *args, **kwargs) -> JSONField | DynamicFormField:
         )
 
     def form_instance(self, *args, **kwargs) -> dynamic_forms.DynamicForm:
-        kwargs.setdefault("prefix", self.id)
+        kwargs.setdefault("prefix", f"model-{self.id}")
         return dynamic_forms.Schema.model_validate(self.form.schema).to_form(*args, **kwargs)
 
     def get_assessment(self):
@@ -166,7 +166,7 @@ def form_field(
         )
 
     def form_instance(self, *args, **kwargs) -> dynamic_forms.DynamicForm:
-        kwargs.setdefault("prefix", self.id)
+        kwargs.setdefault("prefix", f"tag-{self.id}")
         return dynamic_forms.Schema.model_validate(self.form.schema).to_form(*args, **kwargs)
 
     def get_form_html(self, **kwargs) -> SafeText: