From 64ab9e282a70948efe22bb5dfbd9b9678736d8f8 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 10 Jul 2019 17:59:20 +0200 Subject: Context record relation table: fix query --- archaeological_context_records/models.py | 6 ++++-- archaeological_context_records/views.py | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'archaeological_context_records') diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index b0e72c4a1..3052844b4 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -911,7 +911,8 @@ class RecordRelationView(models.Model): """ TABLE_COLS = [ "relation_type", - "right_record__label", "right_record__unit", "right_record__parcel", + "right_record__label", "right_record__unit", + "right_record__parcel", "right_record__datings__period", "right_record__description"] COL_LABELS = { "relation_type": _("Relation type"), @@ -924,7 +925,8 @@ class RecordRelationView(models.Model): # search parameters EXTRA_REQUEST_KEYS = { - "left_record_id": "left_record_id" + "left_record_id": "left_record_id", + "right_record__unit": "right_record__unit__label" } left_record = models.ForeignKey(ContextRecord, related_name='+', on_delete=models.DO_NOTHING) diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index 5b858a76a..122da8c2f 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -88,7 +88,8 @@ get_contextrecord_for_ope = get_item( get_contextrecordrelation = get_item( models.RecordRelationView, 'get_contextrecordrelation', 'contextrecordrelation', specific_perms=['view_recordrelation'], - do_not_deduplicate=True + do_not_deduplicate=True, + extra_request_keys=models.RecordRelationView.EXTRA_REQUEST_KEYS ) get_contextrecordrelationdetail = get_item( -- cgit v1.2.3