diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-06-14 00:06:50 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-06-14 00:06:50 +0200 |
| commit | 925d922c76979aab57acb2c704bf37214c081748 (patch) | |
| tree | 798e513566e218efcb149e02edcddd8617c6f64e /archaeological_finds | |
| parent | 9b7629324fe6bfcf912259c31176da81a015559f (diff) | |
| parent | d8dbe942763ca621a6ae91ecfe70d1cd749e793f (diff) | |
| download | Ishtar-925d922c76979aab57acb2c704bf37214c081748.tar.bz2 Ishtar-925d922c76979aab57acb2c704bf37214c081748.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_finds')
| -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 9a993ad37..4fea6edd3 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -246,7 +246,7 @@ class BaseFind(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 + @@ -293,8 +293,8 @@ class BaseFind(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) @@ -306,7 +306,7 @@ class BaseFind(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]) |