Merge pull request #1137 from devinit/patch/pivot-table

Fix pivot table gets_row_highlights tag
devinit · Apr 26, 2022 · 5933089 · 5933089
2 parents cb602b3 + 18e2740
commit 5933089
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/di_website/visualisation/templates/visualisation/partials/pivot_table.html b/di_website/visualisation/templates/visualisation/partials/pivot_table.html
@@ -8,7 +8,7 @@ <h3 class="type-l type-l--trailer">{{ item.title }}</h3>
     </div>
   {% endif %}
 {% endif %}
-{% gets_row_highlights as row_highlights %}
+{% gets_row_highlights pivot_page=item as row_highlights %}
 <div class="chart-container chart-container--full">
   <div class="charts__chart" data-title="{{item.title}}">
     <div

diff --git a/di_website/visualisation/templatetags/chart_utils.py b/di_website/visualisation/templatetags/chart_utils.py
@@ -71,11 +71,9 @@ def load_viz_assets(context, source='header'):
     return load_as_template(context, '\n'.join(assets))
 
 @register.simple_tag(takes_context=True)
-def gets_row_highlights(context):
-    context = Context(context)
-    self = context['page']
+def gets_row_highlights(context, pivot_page):
     highlights = []
-    for highlight in self.row_highlights.all():
+    for highlight in pivot_page.row_highlights.all():
         highlights.append({
                 "field": highlight.row_highlight_field,
                 "condition": highlight.row_highlight_condition,