diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-07-10 17:59:20 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-07-10 17:59:20 +0200 |
| commit | 64ab9e282a70948efe22bb5dfbd9b9678736d8f8 (patch) | |
| tree | b462ea565f319b488d69d0f2a727a2999c72ab6a | |
| parent | 5b47cc6c19e04022b92dde608f076a3328951269 (diff) | |
| download | Ishtar-64ab9e282a70948efe22bb5dfbd9b9678736d8f8.tar.bz2 Ishtar-64ab9e282a70948efe22bb5dfbd9b9678736d8f8.zip | |
Context record relation table: fix query
| -rw-r--r-- | archaeological_context_records/models.py | 6 | ||||
| -rw-r--r-- | archaeological_context_records/views.py | 3 |
2 files changed, 6 insertions, 3 deletions
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( |