summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archaeological_context_records/models.py2
-rw-r--r--archaeological_files/models.py2
-rw-r--r--archaeological_finds/models_finds.py2
-rw-r--r--archaeological_finds/models_treatments.py5
-rw-r--r--archaeological_operations/models.py7
-rw-r--r--archaeological_warehouse/models.py6
-rw-r--r--ishtar_common/models.py8
-rw-r--r--ishtar_common/models_common.py12
-rw-r--r--ishtar_common/views.py3
9 files changed, 46 insertions, 1 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index e929e9957..4c642a464 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -746,6 +746,8 @@ class ContextRecord(
ALT_NAMES.update(GeoItem.ALT_NAMES)
ALT_NAMES.update(Imported.ALT_NAMES)
+ DEFAULT_SEARCH_FORM = ("archaeological_context_records.forms", "RecordSelect")
+
BASE_SEARCH_VECTORS = [
SearchVectorConfig("label", "raw"),
SearchVectorConfig("location"),
diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index 9e06db0f2..33b8de18e 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -614,6 +614,8 @@ class File(
ALT_NAMES.update(DocumentItem.ALT_NAMES)
ALT_NAMES.update(Imported.ALT_NAMES)
+ DEFAULT_SEARCH_FORM = ("archaeological_files.forms", "FileSelect")
+
POST_PROCESS_REQUEST = {
"towns__numero_insee__startswith": "_get_department_code",
}
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 2ab4e23bf..49b750459 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -1789,6 +1789,8 @@ class Find(
ALT_NAMES.update(GeoItem.ALT_NAMES_FOR_FIND())
ALT_NAMES.update(Imported.ALT_NAMES)
+ DEFAULT_SEARCH_FORM = ("archaeological_finds.forms", "FindSelect")
+
"""
# kept as an example
DYNAMIC_REQUESTS = {
diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py
index cbca04c9a..3f468b480 100644
--- a/archaeological_finds/models_treatments.py
+++ b/archaeological_finds/models_treatments.py
@@ -178,6 +178,9 @@ class Treatment(
}
ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES)
ALT_NAMES.update(DocumentItem.ALT_NAMES)
+
+ DEFAULT_SEARCH_FORM = ("archaeological_finds.forms_treatments", "TreatmentSelect")
+
HISTORICAL_M2M = [
"treatment_types",
]
@@ -1188,6 +1191,8 @@ class TreatmentFile(
ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES)
ALT_NAMES.update(DocumentItem.ALT_NAMES)
+ DEFAULT_SEARCH_FORM = ("archaeological_finds.forms_treatments", "TreatmentFileSelect")
+
# fields
year = models.IntegerField(_("Year"), default=get_current_year)
index = models.IntegerField(_("Index"), default=1)
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 42325d8be..af689f421 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -556,6 +556,8 @@ class ArchaeologicalSite(
ALT_NAMES.update(GeoItem.ALT_NAMES)
ALT_NAMES.update(Imported.ALT_NAMES)
+ DEFAULT_SEARCH_FORM = ("archaeological_operations.forms", "SiteSelect")
+
UP_MODEL_QUERY = {
"operation": (
pgettext_lazy("key for text search", "operation"),
@@ -1441,6 +1443,8 @@ class Operation(
ALT_NAMES.update(GeoItem.ALT_NAMES)
ALT_NAMES.update(Imported.ALT_NAMES)
+ DEFAULT_SEARCH_FORM = ("archaeological_operations.forms", "OperationSelect")
+
QA_EDIT = QuickAction(
url="operation-qa-bulk-update",
icon_class="fa fa-pencil",
@@ -3003,6 +3007,9 @@ class AdministrativeAct(DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter,
ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES)
ALT_NAMES.update(DocumentItem.ALT_NAMES)
+ DEFAULT_SEARCH_FORM = ("archaeological_operations.forms",
+ "AdministrativeActOpeSelect")
+
UP_MODEL_QUERY = {}
POST_PROCESS_REQUEST = {
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index db549912d..9700e689a 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -369,6 +369,9 @@ class Warehouse(
"precise_town_id",
),
}
+
+ DEFAULT_SEARCH_FORM = ("archaeological_warehouse.forms", "WarehouseSelect")
+
GEO_LABEL = "name"
CACHED_LABELS = ["cached_town_label"]
@@ -1072,6 +1075,9 @@ class Container(
"container_type__stationary",
),
}
+
+ DEFAULT_SEARCH_FORM = ("archaeological_warehouse.forms", "ContainerSelect")
+
REVERSED_BOOL_FIELDS = [
"children__isnull",
"documents__image__isnull",
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 1ac95dd7e..ffe078efd 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -2656,6 +2656,9 @@ class Organization(Address, Merge, OwnPerms, BaseGenderedType, ValueGetter, Main
"museum_museofile_id__iexact",
),
}
+
+ DEFAULT_SEARCH_FORM = ("ishtar_common.forms_common", "OrganizationSelect")
+
QA_EDIT = QuickAction(
url="organization-qa-bulk-update",
icon_class="fa fa-pencil",
@@ -2937,6 +2940,9 @@ class Person(Address, Merge, OwnPerms, ValueGetter, MainItem):
"profiles__profile_type__label__iexact",
),
}
+
+ DEFAULT_SEARCH_FORM = ("ishtar_common.forms_common", "PersonSelect")
+
QA_EDIT = QuickAction(
url="person-qa-bulk-update",
icon_class="fa fa-pencil",
@@ -4498,6 +4504,8 @@ class Document(
}
ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES)
+ DEFAULT_SEARCH_FORM = ("ishtar_common.forms_common", "DocumentSelect")
+
# search parameters
REVERSED_BOOL_FIELDS = ["image__isnull", "associated_file__isnull"]
DATED_FIELDS = BaseHistorizedItem.DATED_FIELDS + [
diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py
index 91a3619ce..d932abf66 100644
--- a/ishtar_common/models_common.py
+++ b/ishtar_common/models_common.py
@@ -9,6 +9,7 @@ import copy
from collections import OrderedDict
import datetime
import fiona
+from importlib import import_module
import json
import logging
import os
@@ -895,11 +896,22 @@ class FullSearch(models.Model):
PARENT_SEARCH_VECTORS = []
# prevent circular dependency
PARENT_ONLY_SEARCH_VECTORS = []
+ # tuple (module, class) in text for dynamic import
+ DEFAULT_SEARCH_FORM = tuple()
class Meta:
abstract = True
@classmethod
+ def get_default_search_form(cls):
+ # DEFAULT_SEARCH_FORM is used to get the form when exporting tables
+ if not cls.DEFAULT_SEARCH_FORM:
+ return
+ form = getattr(import_module(cls.DEFAULT_SEARCH_FORM[0]),
+ cls.DEFAULT_SEARCH_FORM[1])
+ return form
+
+ @classmethod
def general_types(cls):
for k in get_all_field_names(cls):
field = cls._meta.get_field(k)
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index a6c3b373d..7e0c01cd8 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -1577,7 +1577,8 @@ class GenerateLabelView(GenerateView):
def get_items(self, request, model):
# rights are managed by get_item
- get_list = get_item(model, None, model.SLUG, own_table_cols=["id"])(
+ get_list = get_item(model, None, model.SLUG, own_table_cols=["id"],
+ search_form=model.get_default_search_form())(
request, no_link=True, no_limit=True
)
item_list = json.loads(get_list.content.decode("utf-8"))["rows"]
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-16 06:46:07 +0000