diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.py b/frappe/email/doctype/auto_email_report/auto_email_report.py index 1b79794a64..faf81f3e65 100644 --- a/frappe/email/doctype/auto_email_report/auto_email_report.py +++ b/frappe/email/doctype/auto_email_report/auto_email_report.py @@ -392,7 +392,7 @@ def make_links(columns, data): def update_field_types(columns): for col in columns: if col.fieldtype in ("Link", "Dynamic Link", "Currency") and col.options != "Currency": - col.fieldtype = "HTML Editor" + col.fieldtype = "Data" col.options = "" return columns diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html index 174769da92..7c50acbbb9 100644 --- a/frappe/templates/print_formats/standard_macros.html +++ b/frappe/templates/print_formats/standard_macros.html @@ -118,7 +118,7 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}" {%- endif %} {%- if df.fieldtype=="Code" %}
{{ doc.get(df.fieldname)|e }}
- {%- elif df.fieldtype in ("Text", "Long Text") -%}
+ {%- elif df.fieldtype in ("Text", "Long Text", "Small Text") -%}
{{ doc.get_formatted(df.fieldname, parent_doc or doc, translated=df.translatable)|e }}
{%- else -%}
{{ doc.get_formatted(df.fieldname, parent_doc or doc, translated=df.translatable) }}
@@ -171,7 +171,7 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}"
{% elif df.fieldtype=="Data" %}
{%- set parent = parent_doc or doc -%}
{{ doc.get_formatted(df.fieldname, parent, translated=df.translatable, absolute_value=parent.absolute_value) |e }}
- {% elif df.fieldtype in ("Text", "Long Text") %}
+ {% elif df.fieldtype in ("Text", "Long Text", "Small Text") %}
{%- set parent = parent_doc or doc -%}
{{ doc.get_formatted(df.fieldname, parent, translated=df.translatable, absolute_value=parent.absolute_value) |e }}
{% else %}
diff --git a/frappe/tests/test_formatter.py b/frappe/tests/test_formatter.py
index aa3db6b2b0..565c321725 100644
--- a/frappe/tests/test_formatter.py
+++ b/frappe/tests/test_formatter.py
@@ -1,7 +1,6 @@
import frappe
from frappe import format
from frappe.tests import IntegrationTestCase
-from frappe.utils.formatters import format_value
class TestFormatter(IntegrationTestCase):
@@ -18,37 +17,3 @@ class TestFormatter(IntegrationTestCase):
self.assertEqual(format(100000, df, doc, format="#,###.##"), "$ 100,000.00")
frappe.db.set_default("currency", None)
-
- def test_safe_formatting(self):
- """Test that in certain field types, the values are escaped."""
- payload = ""
- sanitized_payload = "<script>alert('testing')</script>"
-
- data_df = frappe._dict({"fieldname": "book_name", "fieldtype": "Data"})
- self.assertEqual(format_value(payload, data_df), sanitized_payload)
-
- text_df = frappe._dict({"fieldname": "book_description", "fieldtype": "Text"})
- self.assertEqual(format_value(payload, text_df), sanitized_payload)
-
- html_df = frappe._dict({"fieldname": "book_title", "fieldtype": "HTML Editor"})
- self.assertEqual(format_value(payload, html_df), payload)
-
- editor_df = frappe._dict({"fieldtype": "Text Editor"})
- formatted_editor = format_value("Bold", editor_df)
- self.assertEqual(formatted_editor, "