From 721b0c7e13156ba3c55c7b3b12cdd00b8390fb49 Mon Sep 17 00:00:00 2001 From: Erik Stein Date: Mon, 8 Jan 2018 17:07:29 +0100 Subject: [PATCH] Rename text field of MarkupContent abstract model. --- shared/markup/content.py | 12 +++++------- shared/markup/models.py | 1 + 2 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 shared/markup/models.py diff --git a/shared/markup/content.py b/shared/markup/content.py index 9c4592a..6029b0e 100644 --- a/shared/markup/content.py +++ b/shared/markup/content.py @@ -19,21 +19,19 @@ class MarkupContent(models.Model): (HTML, _("HTML")), ) markup_format = models.CharField(max_length=20, choices=MARKUP_FORMATS, default=MARKDOWN) - text = models.TextField() + content = models.TextField(_("text")) + css_class = models.CharField(_("CSS-Klasse"), max_length=50, help_text=_("Über die CSS-Klasse kann die Darstellung gesteuert werden."), null=True, blank=True) class Meta: abstract = True def render(self, inline=False, **kwargs): - # TODO Use request? - if self.markup_format == self.MARKDOWN: # Marked safe by the markdown converter - return markdown_to_html(self.text, inline=inline) + return markdown_to_html(self.content, inline=inline) elif self.markup_format == self.HTML: - return mark_safe(self.text) + return mark_safe(self.content) else: - # TODO Use linebreaks filter - return linebreaks(conditional_escape(self.text)) + return linebreaks(conditional_escape(self.content)) diff --git a/shared/markup/models.py b/shared/markup/models.py new file mode 100644 index 0000000..cfa2d96 --- /dev/null +++ b/shared/markup/models.py @@ -0,0 +1 @@ +# Intentionally left blank \ No newline at end of file