Pass sid values not objects for measure selections display list

uktrade · Mar 22, 2024 · 33c0220 · 33c0220
1 parent 8d9ca9e
commit 33c0220
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/measures/jinja2/includes/measures/list.jinja b/measures/jinja2/includes/measures/list.jinja
@@ -116,9 +116,9 @@
   <div class="govuk-details__text">
   {% if measure_selections %}
     {% set table_rows = [] %}
-      {% for measure in measure_selections %}
+      {% for sid in measure_selections %}
         {% set measure_link %}
-          <a class="govuk-link govuk-!-font-weight-bold" href="{{measure.get_url()}}">{{measure.sid}}</a>
+          <a class="govuk-link govuk-!-font-weight-bold" href="{{ url('measure-ui-detail', args=[sid]) }}">{{sid}}</a>
         {% endset %}
         {{ table_rows.append([
           {"html": measure_link},

diff --git a/measures/views.py b/measures/views.py
@@ -346,13 +346,10 @@ def get_context_data(self, **kwargs):
         if context["has_next_page"]:
             context["next_page_number"] = page.next_page_number()
 
-        measure_selections = [
-            SelectableObjectsForm.object_id_from_field_name(name)
-            for name in self.measure_selections
-        ]
         context["measure_selections"] = models.Measure.objects.filter(
-            pk__in=measure_selections,
-        )
+            pk__in=self.measure_selections,
+        ).values_list("sid", flat=True)
+
         context["query_params"] = True
         context[
             "base_url"