diff options
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 2a8e9fdad..5e8107d17 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1781,23 +1781,24 @@ class CustomForm(models.Model): ADMIN_SECTION = _("Custom data / custom forms") MODELS = { - "contextrecord": ("archaeological_context_records", "contextrecord"), - "file": ("archaeological_files", "contextrecord"), - "adminact": ("archaeological_operations", "administrativeact"), - "operation": ("archaeological_operations", "operation"), - "archaeological_site": ("archaeological_operations", "archaeologicalsite"), - "find": ("archaeological_finds", "find"), - "findbasket": ("archaeological_finds", "findbasket"), - "treatment": ("archaeological_finds", "treatment"), - "treatmentfile": ("archaeological_finds", "treatmentfile"), - "exhibition": ("archaeological_finds", "exhibition"), - "warehouse": ("archaeological_warehouse", "warehouse"), - "container": ("archaeological_warehouse", "container"), - "person": ("ishtar_common", "person"), - "organization": ("ishtar_common", "organization"), - "biographicalnote": ("ishtar_common", "biographicalnote"), - "document": ("ishtar_common", "document"), - "geoitem": ("ishtar_common", "geovectordata"), + "contextrecord": (("archaeological_context_records", "contextrecord"),), + "file": (("archaeological_files", "contextrecord"),), + "adminact": (("archaeological_operations", "administrativeact"),), + "operation": (("archaeological_operations", "operation"),), + "archaeological_site": (("archaeological_operations", "archaeologicalsite"),), + "find": (("archaeological_finds", "find"), + ("archaeological_finds", "basefind")), + "findbasket": (("archaeological_finds", "findbasket"),), + "treatment": (("archaeological_finds", "treatment"),), + "treatmentfile": (("archaeological_finds", "treatmentfile"),), + "exhibition": (("archaeological_finds", "exhibition"),), + "warehouse": (("archaeological_warehouse", "warehouse"),), + "container": (("archaeological_warehouse", "container"),), + "person": (("ishtar_common", "person"),), + "organization": (("ishtar_common", "organization"),), + "biographicalnote": (("ishtar_common", "biographicalnote"),), + "document": (("ishtar_common", "document"),), + "geoitem": (("ishtar_common", "geovectordata"),), } def natural_key(self): @@ -1870,10 +1871,10 @@ class CustomForm(models.Model): model_name = self.form.split("-")[0] content_types = [] if model_name in self.MODELS: - app_name, model_name = self.MODELS[model_name] - q = ContentType.objects.filter(app_label=app_name, model=model_name) - if q.count(): - content_types.append(q.all()[0]) + for app_name, model_name in self.MODELS[model_name]: + q = ContentType.objects.filter(app_label=app_name, model=model_name) + if q.count(): + content_types.append(q.all()[0]) if not content_types: register, register_fields = self.register() if self.form not in self._register: |