firewall: fix TypeError in add_blacklist_item()

704027af · Bach Dániel · 9a6884bf · 704027af
Commit 704027af authored Feb 27, 2015 by Bach Dániel
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

circle/firewall/views.py
+3 -2

No files found.
--- a/circle/firewall/views.py
+++ b/circle/firewall/views.py
@@ -87,8 +87,9 @@ def add_blacklist_item(request):
            pass

    now = timezone.now()
-    can_update = ((obj.whitelisted and now > obj.expires_at) or
-                  not obj.whitelisted)
+    can_update = (
+        (obj.whitelisted and obj.expires_at and now > obj.expires_at) or
+        not obj.whitelisted)
    is_new = created or (obj.expires_at and now > obj.expires_at)

    if created or can_update: