diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-08-25 13:31:45 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-08-25 13:31:45 +0200 |
| commit | 9f8e9e9157f23458417433eff07dc3efc5542309 (patch) | |
| tree | 3f8393b6e3ebcb517cc6d16d679c262731ef95a9 /archaeological_context_records | |
| parent | a3f562c6050819aeee23bd10e3efa38126e7f0d7 (diff) | |
| download | Ishtar-9f8e9e9157f23458417433eff07dc3efc5542309.tar.bz2 Ishtar-9f8e9e9157f23458417433eff07dc3efc5542309.zip | |
Simplify access to operation for context records (don't use the parcel anymore) (refs #1317)
Diffstat (limited to 'archaeological_context_records')
| -rw-r--r-- | archaeological_context_records/models.py | 16 | ||||
| -rw-r--r-- | archaeological_context_records/wizards.py | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 93b37d87e..c6d8ec023 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -91,7 +91,7 @@ class ContextRecord(BaseHistorizedItem, OwnPerms): 'operation.operation_code', 'label', 'unit'] if settings.COUNTRY == 'fr': - TABLE_COLS.insert(1, 'parcel.operation.code_patriarche') + TABLE_COLS.insert(1, 'operation.code_patriarche') parcel = models.ForeignKey(Parcel, verbose_name=_(u"Parcel"), related_name='context_record') operation = models.ForeignKey(Operation, verbose_name=_(u"Operation"), @@ -148,22 +148,22 @@ class ContextRecord(BaseHistorizedItem, OwnPerms): self.label] if item]) def full_label(self): - if not self.parcel.operation: + if not self.operation: return unicode(self) return self._real_label() or self._temp_label() def _real_label(self): - if not self.parcel.operation.code_patriarche: + if not self.operation.code_patriarche: return - return settings.JOINT.join((self.parcel.operation.code_patriarche, - self.label)) + return settings.JOINT.join((self.operation.code_patriarche, + self.label)) def _temp_label(self): - if self.parcel.operation.code_patriarche: + if self.operation.code_patriarche: return return settings.JOINT.join([unicode(lbl) for lbl in [ - self.parcel.operation.year, - self.parcel.operation.operation_code, + self.operation.year, + self.operation.operation_code, self.label] if lbl]) @classmethod diff --git a/archaeological_context_records/wizards.py b/archaeological_context_records/wizards.py index 86ce3bd30..afed15c4e 100644 --- a/archaeological_context_records/wizards.py +++ b/archaeological_context_records/wizards.py @@ -44,7 +44,7 @@ class RecordWizard(Wizard): pass current_cr = self.get_current_object() if current_cr: - return current_cr.parcel.operation + return current_cr.operation # get_template_context def get_context_data(self, form, **kwargs): |