From 31b4389aa2cd737f18752eb3a260324ce46ec0a7 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Fri, 16 Feb 2018 12:36:16 +0000
Subject: [PATCH] Make querying over wagtail objects easier
---
opentech/apply/dashboard/tables.py | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/opentech/apply/dashboard/tables.py b/opentech/apply/dashboard/tables.py
index 2df29a7c0..d2e6c071a 100644
--- a/opentech/apply/dashboard/tables.py
+++ b/opentech/apply/dashboard/tables.py
@@ -58,11 +58,35 @@ class Select2ModelMultipleChoiceFilter(Select2MultipleChoiceFilter, filters.Mode
pass
+class WagtailMulitChoiceFilter(Select2ModelMultipleChoiceFilter):
+ @property
+ def wagtail_query(self):
+ # Queries on related pages will first attempt to query through the Page object
+ def is_page(relation):
+ return relation.field.related_model == Page
+
+ wagtail_path = list()
+ steps = self.field_name.split('__')
+ related_item = self.model
+ for step in steps:
+ related_item = getattr(related_item, step)
+ wagtail_path.append(step)
+ if is_page(related_item):
+ # Traverse over the page object to get the model at the other end
+ related_item = getattr(related_item.field.related_model, step).related.remote_field.model
+ wagtail_path.append(step)
+
+ return '__'.join(wagtail_path)
+
+ def get_filter_predicate(self, v):
+ return {self.wagtail_query: v}
+
+
class SubmissionFilter(filters.FilterSet):
round = Select2ModelMultipleChoiceFilter(queryset=get_used_rounds, label='Rounds')
funds = Select2ModelMultipleChoiceFilter(name='page', queryset=get_used_funds, label='Funds')
status = Select2MultipleChoiceFilter(name='status__contains', choices=status_options, label='Status')
- lead = Select2ModelMultipleChoiceFilter(name='round__lead', queryset=get_round_leads, label='Lead')
+ lead = WagtailMulitChoiceFilter(name='round__lead', queryset=get_round_leads, label='Lead')
class Meta:
model = ApplicationSubmission
--
GitLab