From 38f69b156cdf1f10ea237984f5c88b362fbb51b7 Mon Sep 17 00:00:00 2001
From: Filipp Lepalaan <filipp@mac.com>
Date: Sun, 8 Nov 2015 20:15:11 +0200
Subject: Cleanup

---
 servo/tasks.py      | 11 ++++++++---
 servo/views/note.py |  6 +++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/servo/tasks.py b/servo/tasks.py
index f54c6d6..a10cb54 100644
--- a/servo/tasks.py
+++ b/servo/tasks.py
@@ -53,6 +53,9 @@ def apply_rules(event):
             if r['action'] == "set_queue":
                 order.set_queue(r['data'], user)
 
+            if r['action'] == "set_priority":
+                pass
+
             if r['action'] == "send_email":
                 try:
                     email = order.customer.valid_email()
@@ -156,14 +159,13 @@ def batch_process(user, data):
 
 @shared_task
 def check_mail():
-    """
-    Checks IMAP box for incoming mail
-    """
+    """Checks IMAP box for incoming mail"""
     uid = Configuration.conf('imap_act')
 
     if empty(uid):
         raise ValueError('Incoming message user not configured')
 
+    counter = 0
     user = User.objects.get(pk=uid)
     server = Configuration.get_imap_server()
     typ, data = server.search(None, "UnSeen")
@@ -176,6 +178,9 @@ def check_mail():
         Note.from_email(msg, user)
         #server.copy(num, 'servo')
         server.store(num, '+FLAGS', '\\Seen')
+        counter += 1
 
     server.close()
     server.logout()
+
+    return '%d/%d messages processed' % counter
diff --git a/servo/views/note.py b/servo/views/note.py
index eb19c61..4793e17 100644
--- a/servo/views/note.py
+++ b/servo/views/note.py
@@ -291,7 +291,7 @@ def templates(request, template_id=None):
 
 def toggle_flag(request, pk, flag):
     field = 'is_%s' % flag
-    note = Note.objects.get(pk=pk)
+    note = get_object_or_404(Note, pk=pk)
     attr = getattr(note, field)
     setattr(note, field, not attr)
     note.save()
@@ -300,8 +300,8 @@ def toggle_flag(request, pk, flag):
 
 
 def toggle_tag(request, pk, tag_id):
-    note = Note.objects.get(pk=pk)
-    tag = Tag.objects.get(pk=tag_id)
+    note = get_object_or_404(Note, pk=pk)
+    tag = get_object_or_404(Tag, pk=tag_id)
 
     if tag in note.labels.all():
         note.labels.remove(tag)
-- 
cgit v1.2.3