Merge branch 'master' into v0.9

1 files changed, 13 insertions, 1 deletions

diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index 38c65a24a..89499463a 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -115,6 +115,11 @@ class ContextRecord(BaseHistorizedItem, OwnPerms, ShortMenuItem):
     TABLE_COLS_FOR_OPE = ['label', 'parcel', 'unit',
                           'datings.period', 'description']
     TABLE_COLS_FOR_OPE_LBL = {'section__parcel_number': _("Parcel")}
+    CONTEXTUAL_TABLE_COLS = {
+        'full': {
+            'related_context_records': 'detailled_related_context_records'
+        }
+    }
     external_id = models.CharField(_(u"External ID"), blank=True, null=True,
                                    max_length=120)
     parcel = models.ForeignKey(Parcel, verbose_name=_(u"Parcel"),
@@ -282,6 +287,13 @@ class ContextRecord(BaseHistorizedItem, OwnPerms, ShortMenuItem):
             q = q.filter(**fltr)
         return q.count()
 
+    def detailled_related_context_records(self):
+        crs = []
+        for cr in self.right_relations.all():
+            crs.append(u"{} ({})".format(cr.right_record,
+                                         cr.relation_type.get_tiny_label()))
+        return u" ; ".join(crs)
+
     def find_docs_q(self):
         from archaeological_finds.models import FindSource
         return FindSource.objects.filter(find__base_finds__context_record=self)
@@ -295,7 +307,7 @@ class RelationType(GeneralRelationType):
     class Meta:
         verbose_name = _(u"Relation type")
         verbose_name_plural = _(u"Relation types")
-        ordering = ('order',)
+        ordering = ('order', 'label')
 
 
 class RecordRelations(GeneralRecordRelations, models.Model):