diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-06-30 17:26:44 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-06-30 17:26:44 +0200 |
| commit | ffd57727a66952e12b5236e7567f5fd75eb7e5f8 (patch) | |
| tree | 2b8ab152e92a95948e9a038ebcef815bfd56aa38 /archaeological_finds/models_finds.py | |
| parent | 2a0842c8ffb0e7eec6b350f9d170670c8376cce8 (diff) | |
| parent | 18995ac80a961083ad986f4abe984fd649ec40e2 (diff) | |
| download | Ishtar-ffd57727a66952e12b5236e7567f5fd75eb7e5f8.tar.bz2 Ishtar-ffd57727a66952e12b5236e7567f5fd75eb7e5f8.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'archaeological_finds/models_finds.py')
| -rw-r--r-- | archaeological_finds/models_finds.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 632df91f5..aa79c2b32 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -247,7 +247,7 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, OwnPerms): c_id = [] if ope.code_patriarche: c_id.append(settings.ISHTAR_OPE_PREFIX + - unicode(ope.code_patriarche)) + ope.code_patriarche) elif ope.year and ope.operation_code: c_id.append( settings.ISHTAR_DEF_OPE_PREFIX + @@ -294,8 +294,8 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, OwnPerms): find = self.get_last_find() finds = [find and find.material_type.code or ''] ope = self.context_record.operation - finds += [unicode(ope.code_patriarche) or - (unicode(ope.year) + "-" + unicode(ope.operation_code))] + finds += [ope.code_patriarche or + (unicode(ope.year) + "-" + ope.operation_code)] finds += [self.context_record.label, unicode(self.material_index)] return settings.JOINT.join(finds) @@ -307,7 +307,7 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, OwnPerms): find = self.get_last_find() lbl = find.label or self.label return settings.JOINT.join( - [unicode(it) for it in ( + [it for it in ( self.context_record.operation.code_patriarche, self.context_record.label, lbl) if it]) |