Merge branch 'master' into v0.9

Conflicts:
	ishtar_common/views.py

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()