diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-03-16 19:48:43 +0100 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-05-09 20:58:16 +0200 | 
| commit | a850add6d883d0a0daed8d1c74da5ace6572431e (patch) | |
| tree | 67b2bd213c896327e2fac50e711f5f28a39ddb64 /archaeological_context_records/models.py | |
| parent | 2728c5a51c474429bea741dc469fd87ed48cee32 (diff) | |
| download | Ishtar-a850add6d883d0a0daed8d1c74da5ace6572431e.tar.bz2 Ishtar-a850add6d883d0a0daed8d1c74da5ace6572431e.zip | |
Changing context record of a find (refs #3080)
Diffstat (limited to 'archaeological_context_records/models.py')
| -rw-r--r-- | archaeological_context_records/models.py | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index bd18ab5d4..ddd9c8609 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -1,6 +1,6 @@  #!/usr/bin/env python  # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2012-2016 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>  # This program is free software: you can redistribute it and/or modify  # it under the terms of the GNU Affero General Public License as @@ -112,9 +112,8 @@ class ContextRecord(BaseHistorizedItem, OwnPerms, ShortMenuItem):                    'label', 'unit']      if settings.COUNTRY == 'fr':          TABLE_COLS.insert(1, 'operation.code_patriarche') -    TABLE_COLS_FOR_OPE = [ -        'label', ['parcel.section', 'parcel.parcel_number'], 'unit', -        'datings.period', 'description'] +    TABLE_COLS_FOR_OPE = ['label', 'parcel', 'unit', +                          'datings.period', 'description']      TABLE_COLS_FOR_OPE_LBL = {'section__parcel_number': _("Parcel")}      external_id = models.CharField(_(u"External ID"), blank=True, null=True,                                     max_length=120) @@ -210,6 +209,7 @@ class ContextRecord(BaseHistorizedItem, OwnPerms, ShortMenuItem):              Q(history_creator=user)      def full_label(self): +        return unicode(self)          if not self.operation:              return unicode(self)          return self._real_label() or self._temp_label() | 
