diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-21 01:31:49 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-21 01:31:49 +0200 |
| commit | 48eb91979705f9999b724c8e2f960fd7931775c1 (patch) | |
| tree | b0ce9167008a2ef608f522680f3d11a0459663e4 /archaeological_context_records/models.py | |
| parent | 5b8c7201eefa8b404afb0cb89b389fd3e8f92899 (diff) | |
| download | Ishtar-48eb91979705f9999b724c8e2f960fd7931775c1.tar.bz2 Ishtar-48eb91979705f9999b724c8e2f960fd7931775c1.zip | |
Djangoization - Major refactoring (step 7)
Work on archaeological_files wizards
Diffstat (limited to 'archaeological_context_records/models.py')
| -rw-r--r-- | archaeological_context_records/models.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 75653e78e..64772627b 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -143,7 +143,7 @@ class ContextRecord(BaseHistorizedItem, OwnPerms): return self.short_label() def short_label(self): - return JOINT.join([unicode(item) for item in [self.parcel, + return settings.JOINT.join([unicode(item) for item in [self.parcel, self.label] if item]) def full_label(self): @@ -154,13 +154,14 @@ class ContextRecord(BaseHistorizedItem, OwnPerms): def _real_label(self): if not self.parcel.operation.code_patriarche: return - return JOINT.join((self.parcel.operation.code_patriarche, + return settings.JOINT.join((self.parcel.operation.code_patriarche, self.label)) def _temp_label(self): if self.parcel.operation.code_patriarche: return - return JOINT.join([unicode(lbl) for lbl in [self.parcel.operation.year, + return settings.JOINT.join([unicode(lbl) for lbl in [ + self.parcel.operation.year, self.parcel.operation.operation_code, self.label] if lbl]) |