diff options
| author | root <root@viserion.(none)> | 2013-03-13 10:44:01 +0000 |
|---|---|---|
| committer | root <root@viserion.(none)> | 2013-03-13 10:44:01 +0000 |
| commit | ca1fe63ce7a1f8a3d908f43e98d5e8a3337b8ae0 (patch) | |
| tree | 3ddcc40aa75a6d63906a4b272fb346b9fa54e9bb /archaeological_operations/models.py | |
| parent | 6eaa8bd10c5034a8ed50f637ffce2c403914e4b3 (diff) | |
| parent | b927a41b76152d722b979abde5cbd09e4ddb552a (diff) | |
| download | Ishtar-ca1fe63ce7a1f8a3d908f43e98d5e8a3337b8ae0.tar.bz2 Ishtar-ca1fe63ce7a1f8a3d908f43e98d5e8a3337b8ae0.zip | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
Diffstat (limited to 'archaeological_operations/models.py')
| -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) |