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_context_records/models.py | |
| parent | 9b7629324fe6bfcf912259c31176da81a015559f (diff) | |
| parent | d8dbe942763ca621a6ae91ecfe70d1cd749e793f (diff) | |
| download | Ishtar-925d922c76979aab57acb2c704bf37214c081748.tar.bz2 Ishtar-925d922c76979aab57acb2c704bf37214c081748.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_context_records/models.py')
| -rw-r--r-- | archaeological_context_records/models.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 855ea7d5c..940330d86 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -390,7 +390,7 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, def _real_label(self): if not self.operation.code_patriarche: return - return settings.JOINT.join((unicode(self.operation.code_patriarche), + return settings.JOINT.join((self.operation.code_patriarche, self.label)) def _temp_label(self): |