diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-02-27 10:49:49 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-04-16 16:42:32 +0200 |
| commit | 0812b486b2bfbf93d3464af48aea2e12fa720c99 (patch) | |
| tree | bd2e30a8dc6c7fd2343f5b315563e2689e780fd5 | |
| parent | 9869da3a9222eab7fb4d6e872ebbeff635e21f82 (diff) | |
| download | Ishtar-0812b486b2bfbf93d3464af48aea2e12fa720c99.tar.bz2 Ishtar-0812b486b2bfbf93d3464af48aea2e12fa720c99.zip | |
🐛 fix administrative act sheet crash (refs #5739)
| -rw-r--r-- | archaeological_operations/models.py | 8 | ||||
| -rw-r--r-- | ishtar_common/utils.py | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index cec9b0869..bcc845f8e 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -20,8 +20,6 @@ from collections import OrderedDict import datetime from itertools import groupby -import json -import re import uuid from django.apps import apps @@ -41,14 +39,12 @@ from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy, get_generated from ishtar_common.models import ( Area, BaseHistorizedItem, - Dashboard, DashboardFormItem, Document, DocumentTemplate, GeneralRecordRelations, GeneralRelationType, GeneralType, - GeoVectorData, Imported, IshtarUser, LightHistorizedItem, @@ -60,7 +56,6 @@ from ishtar_common.models import ( post_delete_record_relation, post_save_cache, RelationItem, - ShortMenuItem, SourceType, Town, ValueGetter, @@ -86,6 +81,7 @@ from ishtar_common.utils import ( mode, m2m_historization_changed, post_save_geo, + SheetItem, ) @@ -2478,7 +2474,7 @@ post_save.connect(post_save_cache, sender=ActType) post_delete.connect(post_save_cache, sender=ActType) -class AdministrativeAct(DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter): +class AdministrativeAct(DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter, SheetItem): TABLE_COLS = [ "full_ref", "signature_date__year", diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py index 1397d9701..3161e0003 100644 --- a/ishtar_common/utils.py +++ b/ishtar_common/utils.py @@ -279,6 +279,7 @@ def check_model_access_control(request, model, available_perms=None): class SheetItem: SHOW_URL = "" SHEET_ALTERNATIVES = [] # list tuple: (key checked in profile, sheet name) + def get_show_url(self): show_url = self.SHOW_URL if not show_url: |