Merge branch 'develop' into bootstrap4

helpdesk/email.py

@@ -362,11 +362,13 @@ def ticket_from_message(message, queue, logger):
 
     if not body:
         mail = BeautifulSoup(part.get_payload(), "lxml")
-        if ">" in mail.text:
-            body = mail.find('body')
-            body = body.text
-            body = body.encode('ascii', errors='ignore')
-        else:
+        beautiful_body = mail.find('body')
+        if beautiful_body:
+            try:
+                body = beautiful_body.text
+            except AttributeError:
+                pass
+        if not body:
             body = mail.text
 
     if ticket:

helpdesk/models.py

@@ -1060,7 +1060,7 @@ class KBItem(models.Model):
     An item within the knowledgebase. Very straightforward question/answer
     style system.
     """
-    voted_by= models.ManyToManyField(settings.AUTH_USER_MODEL)
+    voted_by = models.ManyToManyField(settings.AUTH_USER_MODEL)
     category = models.ForeignKey(
         KBCategory,
         on_delete=models.CASCADE,

helpdesk/views/kb.py

@@ -47,7 +47,7 @@ def vote(request, item):
     item = get_object_or_404(KBItem, pk=item)
     vote = request.GET.get('vote', None)
     if vote in ('up', 'down'):
-        if request.user not in item.voted_by: 
+        if request.user not in item.voted_by:
 
             item.votes += 1
             if vote == 'up':