diff options
Diffstat (limited to 'archaeological_context_records/models.py')
| -rw-r--r-- | archaeological_context_records/models.py | 16 | 
1 files changed, 8 insertions, 8 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  | 
