Sfoglia il codice sorgente

Merge pull request #9981 from chcon/develop

re-enable markdown in custom columns
Jeremy Stretch 3 anni fa
parent
commit
a8dd809f8e
1 ha cambiato i file con 10 aggiunte e 0 eliminazioni
  1. 10 0
      netbox/netbox/tables/columns.py

+ 10 - 0
netbox/netbox/tables/columns.py

@@ -418,6 +418,14 @@ class CustomFieldColumn(tables.Column):
     """
     Display custom fields in the appropriate format.
     """
+    template_code = """
+    {% if value %}
+      {{ value|markdown }}
+    {% else %}
+      —
+    {% endif %}
+    """
+
     def __init__(self, customfield, *args, **kwargs):
         self.customfield = customfield
         kwargs['accessor'] = Accessor(f'custom_field_data__{customfield.name}')
@@ -445,6 +453,8 @@ class CustomFieldColumn(tables.Column):
             return mark_safe(', '.join(
                 self._likify_item(obj) for obj in self.customfield.deserialize(value)
             ))
+        if self.customfield.type == CustomFieldTypeChoices.TYPE_LONGTEXT:
+            return Template(self.template_code).render(Context({"value": value}))
         if value is not None:
             obj = self.customfield.deserialize(value)
             return mark_safe(self._likify_item(obj))