Merge pull request #4800 from ebmdatalab/evansd/measure-tag-links

Fix measure tag links
ebmdatalab · May 22, 2024 · b9f2afe · b9f2afe
2 parents fecf273 + 3c0e11c
commit b9f2afe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/openprescribing/frontend/views/views.py b/openprescribing/frontend/views/views.py
@@ -544,6 +544,10 @@ def measure_for_one_entity(request, measure, entity_code, entity_type):
         ),
         "rollUpBy": "measure_id",
         "tagsFocusUrlTemplate": _url_template("measures_for_one_" + entity_type),
+        "allMeasuresForOrgUrl": reverse(
+            "measures_for_one_" + entity_type,
+            kwargs={entity_type + "_code": entity_code},
+        ),
     }
 
     _add_measure_for_children_in_entity_url(measure_options, entity_type)
@@ -589,6 +593,7 @@ def measure_for_all_england(request, measure):
         ),
         "rollUpBy": "measure_id",
         "tagsFocusUrlTemplate": reverse("all_england"),
+        "allMeasuresForOrgUrl": reverse("all_england"),
     }
 
     _add_measure_details(measure_options, measure)

diff --git a/openprescribing/media/js/src/measure_utils.js b/openprescribing/media/js/src/measure_utils.js
@@ -446,6 +446,7 @@ var utils = {
       measureForAllPracticesUrl: measureForAllPracticesUrl,
       measureForAllCCGsUrl: measureForAllCCGsUrl,
       measureForSiblingsUrl: measureForSiblingsUrl,
+      allMeasuresForOrgUrl: options.allMeasuresForOrgUrl || "",
       improvementRadarUrl: improvementRadarUrl,
       chartExplanation: chartExplanation,
       tags: d.tags,

diff --git a/openprescribing/templates/_measures_panel.html b/openprescribing/templates/_measures_panel.html
@@ -110,7 +110,7 @@
             <div class="descriptive">
               <strong>Tagged as:</strong>
               {{# each tagsForDisplay as |tag index|}}
-                <a href="?tags={{ tag.id }}">{{ tag.name }}</a>{{#unless @last }}, {{/unless}}
+                <a href="{{ ../allMeasuresForOrgUrl }}?tags={{ tag.id }}">{{ tag.name }}</a>{{#unless @last }}, {{/unless}}
               {{/each}}
               {{# unless tagsForDisplay }}<em>No tags yet</em>{{/unless}}
             </div>