Merge branch 'hotfix/20241223_0905_issue4034_html_escape' into develop

DOAJ · Dec 23, 2024 · 5711e28 · 5711e28
2 parents fd60766 + 6fbdc59
commit 5711e28
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/portality/forms/application_forms.py b/portality/forms/application_forms.py
@@ -1346,7 +1346,7 @@ class FieldDefinitions:
              "subfields": ["preservation_service_library", "preservation_service_url"]},
             {"display": "Other", "value": "other",
              "subfields": ["preservation_service_other", "preservation_service_url"]},
-            {"display": "<em>The journal content isn’t archived with a long-term preservation service</em>",
+            {"display": HTMLString("<em>The journal content isn’t archived with a long-term preservation service</em>"),
              "value": "none", "exclusive": True}
         ],
         "help": {
@@ -1481,7 +1481,7 @@ class FieldDefinitions:
             {"display": "Sherpa/Romeo", "value": "Sherpa/Romeo", "subfields": ["deposit_policy_url"]},
             {"display": "Other (including publisher’s own site)", "value": "other",
              "subfields": ["deposit_policy_other", "deposit_policy_url"]},
-            {"display": "<em>The journal has no repository policy</em>", "value": "none", "exclusive": True}
+            {"display": HTMLString("<em>The journal has no repository policy</em>"), "value": "none", "exclusive": True}
         ],
         "help": {
             "long_help": ["Many authors wish to deposit a copy of their paper in an institutional or other repository "
@@ -1595,7 +1595,7 @@ class FieldDefinitions:
             {"display": "Handles", "value": "Handles"},
             {"display": "PURLs", "value": "PURL"},
             {"display": "Other", "value": "other", "subfields": ["persistent_identifiers_other"]},
-            {"display": "<em>The journal does not use persistent article identifiers</em>", "value": "none",
+            {"display": HTMLString("<em>The journal does not use persistent article identifiers</em>"), "value": "none",
              "exclusive": True}
         ],
         "help": {
@@ -3221,7 +3221,8 @@ def __call__(self, field, **kwargs):
             if self.prefix_label:
                 html.append('<li tabindex=0>%s %s' % (subfield.label, subfield(**kwargs)))
             else:
-                html.append('<li tabindex=0>%s %s' % (subfield(**kwargs), subfield.label))
+                label = str(subfield.label)
+                html.append('<li tabindex=0>%s %s' % (subfield(**kwargs), label))
 
             html.append("</li>")