diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2013-03-13 10:44:01 +0000 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2013-03-13 10:44:01 +0000 |
| commit | ad3c2ea7b5a68545669d9a7c0d63dec8980e2109 (patch) | |
| tree | 3ddcc40aa75a6d63906a4b272fb346b9fa54e9bb | |
| parent | 9b927d3e22d6f574d560315357d25332d6546d5b (diff) | |
| parent | 8a21118a4ab368f812ba1abc485e2662cc365ea6 (diff) | |
| download | Ishtar-ad3c2ea7b5a68545669d9a7c0d63dec8980e2109.tar.bz2 Ishtar-ad3c2ea7b5a68545669d9a7c0d63dec8980e2109.zip | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
| -rw-r--r-- | archaeological_operations/models.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 20c8df16f..a0b751802 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -132,7 +132,8 @@ class Operation(BaseHistorizedItem, OwnPerms): items = [unicode(_('Intercommunal'))] if self.towns.count() == 1: items[0] = unicode(self.towns.all()[0]) - items.append("-".join((unicode(self.year), + if self.operation_code: + items.append("-".join((unicode(self.year), unicode(self.operation_code)))) return settings.JOINT.join(items) |