From 3f1bb376c8321850fe91f7cc637817660261dfed Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Wed, 1 Aug 2018 12:29:45 +0100
Subject: [PATCH] Prevent &nbsp being included in the text

---
 .../apply/activity/templates/messages/email/determination.html  | 2 +-
 opentech/apply/determinations/models.py                         | 2 +-
 opentech/apply/determinations/views.py                          | 2 +-
 opentech/apply/utils/options.py                                 | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/opentech/apply/activity/templates/messages/email/determination.html b/opentech/apply/activity/templates/messages/email/determination.html
index b51f4dcb3..d224887ec 100644
--- a/opentech/apply/activity/templates/messages/email/determination.html
+++ b/opentech/apply/activity/templates/messages/email/determination.html
@@ -2,7 +2,7 @@
 {% load bleach_tags %}
 
 {% block content %}
-{{ submission.determination.clean_message }}
+{{ submission.determination.message|bleach }}
 {% endblock %}
 
 
diff --git a/opentech/apply/determinations/models.py b/opentech/apply/determinations/models.py
index 57d234e00..2ad79b26a 100644
--- a/opentech/apply/determinations/models.py
+++ b/opentech/apply/determinations/models.py
@@ -53,7 +53,7 @@ class Determination(models.Model):
     updated_at = models.DateTimeField(verbose_name=_('Update time'), auto_now=True)
 
     @property
-    def clean_message(self):
+    def stripped_message(self):
         return bleach.clean(self.message, tags=[], strip=True)
 
     @property
diff --git a/opentech/apply/determinations/views.py b/opentech/apply/determinations/views.py
index d39cfac32..a8154435f 100644
--- a/opentech/apply/determinations/views.py
+++ b/opentech/apply/determinations/views.py
@@ -84,7 +84,7 @@ class DeterminationCreateOrUpdateView(CreateOrUpdateView):
             if self.object.outcome == NEEDS_MORE_INFO:
                 # We keep a record of the message sent to the user in the comment
                 Activity.comments.create(
-                    message=self.object.clean_message,
+                    message=self.object.stripped_message,
                     user=self.request.user,
                     submission=self.submission,
                 )
diff --git a/opentech/apply/utils/options.py b/opentech/apply/utils/options.py
index b2ef62f9a..2b8ccc214 100644
--- a/opentech/apply/utils/options.py
+++ b/opentech/apply/utils/options.py
@@ -3,6 +3,7 @@ from tinymce.widgets import TinyMCE
 MCE_ATTRIBUTES = {
     'elementpath': False,
     'branding': False,
+    'entity_encoding': 'raw',
     'toolbar1': 'undo redo | styleselect | bold italic | bullist numlist | link',
     'style_formats': [
         {'title': 'Headers', 'items': [
-- 
GitLab