diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-08-29 15:39:44 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-08-29 15:39:44 +0200 |
| commit | d323cdcbf698fefa9f2d29589261d0757f4417c9 (patch) | |
| tree | 2b85c3e81e5b7849c962502fbe1d654094443865 | |
| parent | d48e91db62ec07eb11fbc8b6b5360ef7a45c4cd0 (diff) | |
| download | Ishtar-d323cdcbf698fefa9f2d29589261d0757f4417c9.tar.bz2 Ishtar-d323cdcbf698fefa9f2d29589261d0757f4417c9.zip | |
Make all "short_label" properties (refs #1370)
| -rw-r--r-- | archaeological_context_records/forms.py | 3 | ||||
| -rw-r--r-- | archaeological_context_records/models.py | 3 | ||||
| -rw-r--r-- | archaeological_operations/models.py | 3 | ||||
| -rw-r--r-- | archaeological_operations/wizards.py | 2 | ||||
| -rw-r--r-- | ishtar_common/models.py | 1 | ||||
| -rw-r--r-- | ishtar_common/wizards.py | 2 |
6 files changed, 9 insertions, 5 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index f90cf7e9d..34f1a5101 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -128,7 +128,8 @@ class RecordFormGeneral(forms.Form): parcels = sorted(parcels, key=sort) for key, gparcels in groupby(parcels, sort): self.fields['parcel'].choices.append( - (" - ".join(key), [(parcel.pk, parcel.short_label()) for parcel in gparcels]) + (" - ".join(key), [(parcel.pk, parcel.short_label) + for parcel in gparcels]) ) self.fields['unit'].choices = models.Unit.get_types() self.fields['unit'].help_text = models.Unit.get_help() diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 45da5935c..d138977bc 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -145,8 +145,9 @@ class ContextRecord(BaseHistorizedItem, OwnPerms): return pgettext("short", u"Context record") def __unicode__(self): - return self.short_label() + return self.short_label + @property def short_label(self): return settings.JOINT.join([unicode(item) for item in [self.parcel, self.label] if item]) diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 6619bc72e..35dc8c20c 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -383,12 +383,13 @@ class Parcel(LightHistorizedItem): verbose_name = _(u"Parcel") verbose_name_plural = _(u"Parcels") + @property def short_label(self): return settings.JOINT.join([unicode(item) for item in [self.section, self.parcel_number] if item]) def __unicode__(self): - return self.short_label() + return self.short_label @staticmethod def grouped_parcels(parcels): diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py index 419cac895..d24b380dd 100644 --- a/archaeological_operations/wizards.py +++ b/archaeological_operations/wizards.py @@ -100,7 +100,7 @@ class OperationWizard(Wizard): try: for parcel in models.File.objects.get(pk=int(file_id) ).parcels.all(): - parcels.append((parcel.pk, parcel.short_label())) + parcels.append((parcel.pk, parcel.short_label)) except (ValueError, ObjectDoesNotExist): pass data['PARCELS'] = sorted(parcels, key=lambda x:x[1]) diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 3f0cdc6b4..0a7c3e1f9 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -168,6 +168,7 @@ class GeneralType(models.Model): def __unicode__(self): return self.label + @property def short_label(self): return self.label diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py index e3df00771..b04ef48ee 100644 --- a/ishtar_common/wizards.py +++ b/ishtar_common/wizards.py @@ -214,7 +214,7 @@ class Wizard(NamedUrlWizardView): for val in values: item = associated_models[key].objects.get(pk=val) if hasattr(item, 'short_label'): - value = item.short_label() + value = item.short_label else: value = unicode(item) rendered_values.append(value) |