From 4dc60e8954934fd0e1d01c360051d0bbc6c7220f Mon Sep 17 00:00:00 2001
From: Erin Mullaney <erin.mullaney@torchbox.com>
Date: Mon, 11 Feb 2019 09:39:40 -0500
Subject: [PATCH] #957 pr updates
---
opentech/apply/activity/messaging.py | 4 ++--
opentech/apply/funds/forms.py | 3 ++-
.../apply/funds/migrations/0052_assigned_reviewers_pre.py | 2 +-
.../funds/templates/funds/includes/delegated_form_base.html | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/opentech/apply/activity/messaging.py b/opentech/apply/activity/messaging.py
index 9f0f34d18..4ee98bb81 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 b78b1a829..556c2e9a9 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 3e11724fd..66f76fe41 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 ec68b976b..c6f0746dc 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">
--
GitLab