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_operations/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_operations/models.py')
| -rw-r--r-- | archaeological_operations/models.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 2c008ef9b..60de936d2 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -129,7 +129,7 @@ class Operation(BaseHistorizedItem, OwnPerms): items[0] = unicode(self.towns.all()[0]) items.append("-".join((unicode(self.year), unicode(self.operation_code)))) - return JOINT.join(items) + return settings.JOINT.join(items) @classmethod def get_available_operation_code(cls, year=None): @@ -301,7 +301,7 @@ related_name='+', verbose_name=_(u"Person in charge of the scientific part")) ) def __unicode__(self): - return JOINT.join([unicode(item) + return settings.JOINT.join([unicode(item) for item in [self.operation, self.associated_file, self.act_object] if item]) @@ -322,7 +322,7 @@ class Parcel(LightHistorizedItem): verbose_name_plural = _(u"Parcels") def short_label(self): - return JOINT.join([unicode(item) for item in [self.section, + return settings.JOINT.join([unicode(item) for item in [self.section, self.parcel_number] if item]) def __unicode__(self): @@ -332,7 +332,7 @@ class Parcel(LightHistorizedItem): items = [unicode(self.operation or self.associated_file)] items += [unicode(item) for item in [self.section, self.parcel_number] if item] - return JOINT.join(items) + return settings.JOINT.join(items) class ParcelOwner(LightHistorizedItem): owner = models.ForeignKey(Person, verbose_name=_(u"Owner")) @@ -345,7 +345,7 @@ class ParcelOwner(LightHistorizedItem): verbose_name_plural = _(u"Parcel owners") def __unicode__(self): - return self.owner + JOINT + self.parcel + return self.owner + settings.JOINT + self.parcel class OperationDashboard: def __init__(self): |