summaryrefslogtreecommitdiff
path: root/archaeological_finds
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2022-05-27 08:30:27 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2022-05-27 08:30:27 +0200
commitc568ea2d213877453f073e8570ec2585c8cc3018 (patch)
tree3c74ff2345a4afa7699d91e09b68b4d168d778af /archaeological_finds
parent3afbba402b5ddfe2f3e5357292a5488ff1bc6de7 (diff)
downloadIshtar-c568ea2d213877453f073e8570ec2585c8cc3018.tar.bz2
Ishtar-c568ea2d213877453f073e8570ec2585c8cc3018.zip
OA prefix: fix customize on sheet, form and save
Diffstat (limited to 'archaeological_finds')
-rw-r--r--archaeological_finds/models_finds.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 29edd7aba..2825faf02 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -592,10 +592,10 @@ class BaseFind(
ope = self.context_record.operation
c_id = []
if ope.code_patriarche:
- c_id.append(profile.operation_prefix + ope.code_patriarche)
+ c_id.append((profile.operation_prefix or "") + ope.code_patriarche)
elif ope.year and ope.operation_code:
c_id.append(
- profile.default_operation_prefix
+ (profile.default_operation_prefix or "")
+ str(ope.year or "")
+ "-"
+ str(ope.operation_code or "")
@@ -819,8 +819,8 @@ class BaseFind(
{filters}
);
""".format(
- main_ope_prefix=profile.operation_prefix,
- ope_prefix=profile.default_operation_prefix,
+ main_ope_prefix=(profile.operation_prefix or ""),
+ ope_prefix=(profile.default_operation_prefix or ""),
join=settings.JOINT,
filters=filters,
zeros=settings.ISHTAR_FINDS_INDEX_ZERO_LEN * "0",
@@ -2679,8 +2679,8 @@ class Find(
{filters}
);
""".format(
- main_ope_prefix=profile.operation_prefix,
- ope_prefix=profile.default_operation_prefix,
+ main_ope_prefix=(profile.operation_prefix or ""),
+ ope_prefix=(profile.default_operation_prefix or ""),
join=settings.JOINT,
filters=filters,
index=index,