From 3d06500787850500ba7755c164de209c3b64230a Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Thu, 19 Sep 2024 17:30:02 -0500 Subject: [PATCH 1/4] fix(frontend): add help text to story form Closes #2364 --- successstories/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/successstories/models.py b/successstories/models.py index e5345b435..db5be8de3 100644 --- a/successstories/models.py +++ b/successstories/models.py @@ -53,7 +53,7 @@ class Story(NameSlugModel, ContentManageable): author = models.CharField(max_length=500, help_text='Author of the content') author_email = models.EmailField(max_length=100, blank=True, null=True) pull_quote = models.TextField() - content = MarkupField(default_markup_type=DEFAULT_MARKUP_TYPE) + content = MarkupField(default_markup_type=DEFAULT_MARKUP_TYPE, help_text="Note: Submissions in Markdown are strongly preferred and can be processed faster.") is_published = models.BooleanField(default=False, db_index=True) featured = models.BooleanField(default=False, help_text="Set to use story in the supernav") image = models.ImageField(upload_to='successstories', blank=True, null=True) From b07a371dfb8561a696332871eda71dd0c5f7070d Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Thu, 19 Sep 2024 17:33:00 -0500 Subject: [PATCH 2/4] chore: source migration --- .../migrations/0013_alter_story_content.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 successstories/migrations/0013_alter_story_content.py diff --git a/successstories/migrations/0013_alter_story_content.py b/successstories/migrations/0013_alter_story_content.py new file mode 100644 index 000000000..a8cfee7f3 --- /dev/null +++ b/successstories/migrations/0013_alter_story_content.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.16 on 2024-09-19 22:32 + +from django.db import migrations +import markupfield.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('successstories', '0012_alter_story_creator_alter_story_last_modified_by'), + ] + + operations = [ + migrations.AlterField( + model_name='story', + name='content', + field=markupfield.fields.MarkupField(help_text='Note: Submissions in Markdown are strongly preferred and can be processed faster.', rendered_field=True), + ), + ] From c33892944351cc841afdb6cae4c4f31890eba904 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Fri, 20 Sep 2024 09:53:55 -0500 Subject: [PATCH 3/4] fix: use meta class overrides instead --- successstories/forms.py | 3 +++ .../migrations/0013_alter_story_content.py | 19 ------------------- successstories/models.py | 2 +- 3 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 successstories/migrations/0013_alter_story_content.py diff --git a/successstories/forms.py b/successstories/forms.py index f623001b0..a9559548d 100644 --- a/successstories/forms.py +++ b/successstories/forms.py @@ -24,6 +24,9 @@ class Meta: labels = { 'name': 'Story name', } + help_texts = { + "content": "Note: Submissions in Markdown are strongly preferred and can be processed faster.", + } def clean_name(self): name = self.cleaned_data.get('name') diff --git a/successstories/migrations/0013_alter_story_content.py b/successstories/migrations/0013_alter_story_content.py deleted file mode 100644 index a8cfee7f3..000000000 --- a/successstories/migrations/0013_alter_story_content.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 4.2.16 on 2024-09-19 22:32 - -from django.db import migrations -import markupfield.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('successstories', '0012_alter_story_creator_alter_story_last_modified_by'), - ] - - operations = [ - migrations.AlterField( - model_name='story', - name='content', - field=markupfield.fields.MarkupField(help_text='Note: Submissions in Markdown are strongly preferred and can be processed faster.', rendered_field=True), - ), - ] diff --git a/successstories/models.py b/successstories/models.py index db5be8de3..e5345b435 100644 --- a/successstories/models.py +++ b/successstories/models.py @@ -53,7 +53,7 @@ class Story(NameSlugModel, ContentManageable): author = models.CharField(max_length=500, help_text='Author of the content') author_email = models.EmailField(max_length=100, blank=True, null=True) pull_quote = models.TextField() - content = MarkupField(default_markup_type=DEFAULT_MARKUP_TYPE, help_text="Note: Submissions in Markdown are strongly preferred and can be processed faster.") + content = MarkupField(default_markup_type=DEFAULT_MARKUP_TYPE) is_published = models.BooleanField(default=False, db_index=True) featured = models.BooleanField(default=False, help_text="Set to use story in the supernav") image = models.ImageField(upload_to='successstories', blank=True, null=True) From cc85402b3104dbc6892fb525c3d7ae9015d6600a Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Fri, 20 Sep 2024 09:57:13 -0500 Subject: [PATCH 4/4] feat: linkify --- successstories/forms.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/successstories/forms.py b/successstories/forms.py index a9559548d..45ec1dfd3 100644 --- a/successstories/forms.py +++ b/successstories/forms.py @@ -25,7 +25,8 @@ class Meta: 'name': 'Story name', } help_texts = { - "content": "Note: Submissions in Markdown are strongly preferred and can be processed faster.", + "content": "Note: Submissions in Markdown " + "are strongly preferred and can be processed faster.", } def clean_name(self):