diff --git a/hypha/apply/determinations/migrations/0012_auto_20220509_1136.py b/hypha/apply/determinations/migrations/0012_auto_20220509_1136.py new file mode 100644 index 0000000000000000000000000000000000000000..1fbaf3e5427cd001e9cb74753f7b4884e66eb2fd --- /dev/null +++ b/hypha/apply/determinations/migrations/0012_auto_20220509_1136.py @@ -0,0 +1,59 @@ +# Generated by Django 3.2.13 on 2022-05-09 11:36 + +from django.db import migrations +import wagtail.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('determinations', '0011_auto_20220111_1314'), + ] + + operations = [ + migrations.AlterField( + model_name='determinationmessagesettings', + name='concept_accepted', + field=wagtail.core.fields.RichTextField(blank=True, verbose_name='Approved'), + ), + migrations.AlterField( + model_name='determinationmessagesettings', + name='concept_more_info', + field=wagtail.core.fields.RichTextField(blank=True, verbose_name='Needs more info'), + ), + migrations.AlterField( + model_name='determinationmessagesettings', + name='concept_rejected', + field=wagtail.core.fields.RichTextField(blank=True, verbose_name='Dismissed'), + ), + migrations.AlterField( + model_name='determinationmessagesettings', + name='proposal_accepted', + field=wagtail.core.fields.RichTextField(blank=True, verbose_name='Approved'), + ), + migrations.AlterField( + model_name='determinationmessagesettings', + name='proposal_more_info', + field=wagtail.core.fields.RichTextField(blank=True, verbose_name='Needs more info'), + ), + migrations.AlterField( + model_name='determinationmessagesettings', + name='proposal_rejected', + field=wagtail.core.fields.RichTextField(blank=True, verbose_name='Dismissed'), + ), + migrations.AlterField( + model_name='determinationmessagesettings', + name='request_accepted', + field=wagtail.core.fields.RichTextField(blank=True, verbose_name='Approved'), + ), + migrations.AlterField( + model_name='determinationmessagesettings', + name='request_more_info', + field=wagtail.core.fields.RichTextField(blank=True, verbose_name='Needs more info'), + ), + migrations.AlterField( + model_name='determinationmessagesettings', + name='request_rejected', + field=wagtail.core.fields.RichTextField(blank=True, verbose_name='Dismissed'), + ), + ] diff --git a/hypha/apply/determinations/models.py b/hypha/apply/determinations/models.py index 5e5bcbb9a5bcc4a265816f664153dbc9c9516248..c309b3e9c6a48c04e56da8b467760d7d0663575b 100644 --- a/hypha/apply/determinations/models.py +++ b/hypha/apply/determinations/models.py @@ -184,17 +184,17 @@ class DeterminationMessageSettings(BaseSetting): class Meta: verbose_name = 'determination messages' - request_accepted = RichTextField("Approved") - request_rejected = RichTextField("Dismissed") - request_more_info = RichTextField("Needs more info") + request_accepted = RichTextField("Approved", blank=True) + request_rejected = RichTextField("Dismissed", blank=True) + request_more_info = RichTextField("Needs more info", blank=True) - concept_accepted = RichTextField("Approved") - concept_rejected = RichTextField("Dismissed") - concept_more_info = RichTextField("Needs more info") + concept_accepted = RichTextField("Approved", blank=True) + concept_rejected = RichTextField("Dismissed", blank=True) + concept_more_info = RichTextField("Needs more info", blank=True) - proposal_accepted = RichTextField("Approved") - proposal_rejected = RichTextField("Dismissed") - proposal_more_info = RichTextField("Needs more info") + proposal_accepted = RichTextField("Approved", blank=True) + proposal_rejected = RichTextField("Dismissed", blank=True) + proposal_more_info = RichTextField("Needs more info", blank=True) def get_for_stage(self, stage_name): message_templates = {} diff --git a/hypha/apply/determinations/templates/determinations/base_determination_form.html b/hypha/apply/determinations/templates/determinations/base_determination_form.html index 26b805e215d47af818c7ed357f1a4299c58c1cf3..947c1fe4ef7c4f754a05cbe112a6f90ca0f2ae3e 100644 --- a/hypha/apply/determinations/templates/determinations/base_determination_form.html +++ b/hypha/apply/determinations/templates/determinations/base_determination_form.html @@ -52,8 +52,7 @@ </form> {% for type, message in message_templates.items %} <div class="is-hidden" data-type="{{ type }}" id="determination-message-{{ type }}"> - <h1>message</h1> - {{ message|bleach }} + {{ message }} </div> {% endfor %} </div> @@ -61,5 +60,5 @@ {% endblock %} {% block extra_js %} - {# Skip this until the script is improved. <script src="{% static 'js/apply/determination-template.js' %}"></script> #} + <script src="{% static 'js/apply/determination-template.js' %}"></script> {% endblock %}