columns exclude configuration for list views

overriding ABSTRACT_ENTITY_COLUMNS_EXCLUDE for entities
acdh-oeaw · Feb 19, 2025 · 5f2cc66 · 5f2cc66
1 parent 69e60ea
commit 5f2cc66
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 13 deletions.
diff --git a/apis_ontology/filtersets.py b/apis_ontology/filtersets.py
@@ -4,7 +4,6 @@
     AbstractEntityFilterSet,
 )
 from apis_core.apis_entities.models import RootObject
-from apis_core.generic.filtersets import GenericFilterSet
 from apis_core.relations.filtersets import RelationFilterSet
 from apis_core.relations.models import Relation
 from django.apps import apps
@@ -13,6 +12,7 @@
 from apis_ontology.forms import (
     PersonSearchForm,
     PlaceSearchForm,
+    RelationSearchForm,
     WorkSearchForm,
 )
 from apis_ontology.models import Instance, Person, Place, Work
@@ -90,6 +90,7 @@ class Meta(AbstractEntityFilterSet.Meta):
 
 class TibScholRelationMixinFilterSet(RelationFilterSet):
     class Meta(RelationFilterSet.Meta):
+        form = RelationSearchForm
         exclude = RelationFilterSet.Meta.exclude + ABSTRACT_ENTITY_FILTERS_EXCLUDE
         filter_overrides = {
             models.CharField: {
@@ -136,7 +137,7 @@ class Meta(AbstractEntityFilterSet.Meta):
 
 
 class PlaceFilterSet(TibScholEntityMixinFilterSet):
-    class Meta:
+    class Meta(TibScholEntityMixinFilterSet.Meta):
         exclude = [
             *ABSTRACT_ENTITY_FILTERS_EXCLUDE,
             "latitude",
@@ -177,7 +178,7 @@ def custom_name_search(self, queryset, name, value):
 
 
 class PersonFilterSet(TibScholEntityMixinFilterSet):
-    class Meta:
+    class Meta(TibScholEntityMixinFilterSet.Meta):
         exclude = [
             *ABSTRACT_ENTITY_FILTERS_EXCLUDE,
             "alternative_names",
@@ -216,7 +217,7 @@ def custom_name_search(self, queryset, name, value):
 
 
 class WorkFilterSet(TibScholEntityMixinFilterSet):
-    class Meta:
+    class Meta(TibScholRelationMixinFilterSet.Meta):
         exclude = [
             *ABSTRACT_ENTITY_FILTERS_EXCLUDE,
             "alternative_names",
@@ -256,7 +257,7 @@ def custom_name_search(self, queryset, name, value):
 
 
 class InstanceFilterSet(TibScholEntityMixinFilterSet):
-    class Meta:
+    class Meta(TibScholEntityMixinFilterSet.Meta):
         exclude = [
             *ABSTRACT_ENTITY_FILTERS_EXCLUDE,
             "alternative_names",

diff --git a/apis_ontology/forms.py b/apis_ontology/forms.py
@@ -1,9 +1,7 @@
-from apis_core.relations.models import Relation
+from apis_core.apis_entities.filtersets import AbstractEntityFilterSetForm
+from apis_core.generic.forms import GenericFilterSetForm, GenericModelForm
 from apis_core.relations.forms import RelationForm
 from django import forms
-from apis_core.generic.forms import GenericFilterSetForm, GenericModelForm
-from django.forms.models import ModelChoiceField
-from django.apps import apps
 
 
 class TibscholEntityForm(GenericModelForm):
@@ -92,7 +90,20 @@ class InstanceForm(TibscholEntityForm):
     ]
 
 
-class PlaceSearchForm(GenericFilterSetForm):
+class TibScholEntityMixinSearchForm(AbstractEntityFilterSetForm):
+    columns_exclude = [
+        "start_start_date",
+        "end_start_date",
+        "start_date",
+        "start_end_date",
+        "end_end_date",
+        "end_date",
+        "rootobject_ptr",
+        "self_contenttype",
+    ]
+
+
+class PlaceSearchForm(TibScholEntityMixinSearchForm):
     field_order = [
         "columns",
         "label",
@@ -103,7 +114,7 @@ class PlaceSearchForm(GenericFilterSetForm):
     ]
 
 
-class PersonSearchForm(GenericFilterSetForm):
+class PersonSearchForm(TibScholEntityMixinSearchForm):
     field_order = [
         "columns",
         "name",
@@ -117,7 +128,7 @@ class PersonSearchForm(GenericFilterSetForm):
     ]
 
 
-class WorkSearchForm(GenericFilterSetForm):
+class WorkSearchForm(TibScholEntityMixinSearchForm):
     field_order = [
         "columns",
         "name",
@@ -131,7 +142,7 @@ class WorkSearchForm(GenericFilterSetForm):
     ]
 
 
-class InstanceSearchForm(GenericFilterSetForm):
+class InstanceSearchForm(TibScholEntityMixinSearchForm):
     field_order = [
         "columns",
         "name",
@@ -152,3 +163,19 @@ class InstanceSearchForm(GenericFilterSetForm):
         "comments",
         "external_links",
     ]
+
+
+class RelationSearchForm(GenericFilterSetForm):
+    columns_exclude = [
+        "subj_object_id",
+        "obj_object_id",
+        "subj_content_type",
+        "obj_content_type",
+        "start_date",
+        "end_date",
+        "start_start_date",
+        "start_end_date",
+        "end_start_date",
+        "end_end_date",
+        "relation_ptr",
+    ]