diff --git a/opentech/apply/activity/messaging.py b/opentech/apply/activity/messaging.py index 9f0f34d18e003130eb7a0f8d54aa4ed0d56f514c..4ee98bb81eebc2fb1032f8276cac7e6f0340d78c 100644 --- a/opentech/apply/activity/messaging.py +++ b/opentech/apply/activity/messaging.py @@ -328,7 +328,7 @@ class SlackAdapter(AdapterBase): ] def reviewers_updated(self, submission, link, user, added=list(), removed=list(), **kwargs): - message = [f'{user} has updated the reviewers on <{link}|{submission.title}>'] + message = [f'{user} has updated the reviewers on <{link}|{submission.title}>.'] if added: message.append('Added:') @@ -338,7 +338,7 @@ class SlackAdapter(AdapterBase): message.append('Removed:') message.extend(reviewers_message(removed)) - return '. '.join(message) + return ' '.join(message) def handle_batch_reviewers(self, submissions, links, user, added, **kwargs): submissions_text = ', '.join( diff --git a/opentech/apply/funds/forms.py b/opentech/apply/funds/forms.py index b78b1a829e5d5dcc18c2af50f2cb00d8e2bc0c58..556c2e9a9bf9e538caf428bb64fa35cd078f90c4 100644 --- a/opentech/apply/funds/forms.py +++ b/opentech/apply/funds/forms.py @@ -1,4 +1,5 @@ from django import forms +from django.utils.text import slugify from django.utils.translation import ugettext_lazy as _ from opentech.apply.users.models import User @@ -90,7 +91,7 @@ class UpdateReviewersForm(forms.ModelForm): } for role in ReviewerRole.objects.all().order_by('order'): - field_name = 'reviewer_role_' + str(role) + field_name = 'reviewer_role_' + slugify(str(role)) self.roles[field_name] = role self.fields[field_name] = forms.ModelChoiceField( diff --git a/opentech/apply/funds/migrations/0052_assigned_reviewers_pre.py b/opentech/apply/funds/migrations/0052_assigned_reviewers_pre.py index 3e11724fd8b5b2c53edb2db655b41dd071bf1058..66f76fe41c3552f3885114bac4ed5c17a501fd42 100644 --- a/opentech/apply/funds/migrations/0052_assigned_reviewers_pre.py +++ b/opentech/apply/funds/migrations/0052_assigned_reviewers_pre.py @@ -29,7 +29,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='assignedreviewers', name='submission', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='funds.ApplicationSubmission'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='assigned', to='funds.ApplicationSubmission'), ), migrations.AddField( model_name='applicationsubmission', diff --git a/opentech/apply/funds/templates/funds/includes/delegated_form_base.html b/opentech/apply/funds/templates/funds/includes/delegated_form_base.html index ec68b976b6dbc99ed62099e30b4f869f154ba5e6..c6f0746dc01080d2b61ae9874c63155cb935f8c0 100644 --- a/opentech/apply/funds/templates/funds/includes/delegated_form_base.html +++ b/opentech/apply/funds/templates/funds/includes/delegated_form_base.html @@ -1,4 +1,4 @@ -{% load wagtailimages_tags util_tags %} +{% load util_tags %} <form class="form {{extra_classes}}" method="post" id="{{ form.name }}"> {% csrf_token %} <div class="form__item">