From a39fe76e479091cd401a7e3df161b9d565be11e2 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Wed, 6 Jun 2012 20:08:25 +0100
Subject: [PATCH] Fix a few minor errors with soft deletes

---
 app/conf/common.py                                            | 2 +-
 .../templates/eve_api/{add.html => eveaccount_add.html}       | 0
 app/eve_api/views/base.py                                     | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename app/eve_api/templates/eve_api/{add.html => eveaccount_add.html} (100%)

diff --git a/app/conf/common.py b/app/conf/common.py
index 1e92dbc..a91b83e 100644
--- a/app/conf/common.py
+++ b/app/conf/common.py
@@ -147,7 +147,7 @@ GARGOYLE_SWITCH_DEFAULTS = {
       'is_active': False,
       'label': 'Disable API Backend Processing',
       'description': 'Disables backend processing for the EVE API, stops Auth hammering the API during outages',
-    }
+    },
     'eve-softkeydelete': {
       'is_active': False,
       'label': 'Soft API Key Deletions',
diff --git a/app/eve_api/templates/eve_api/add.html b/app/eve_api/templates/eve_api/eveaccount_add.html
similarity index 100%
rename from app/eve_api/templates/eve_api/add.html
rename to app/eve_api/templates/eve_api/eveaccount_add.html
diff --git a/app/eve_api/views/base.py b/app/eve_api/views/base.py
index 5501715..533ed0d 100644
--- a/app/eve_api/views/base.py
+++ b/app/eve_api/views/base.py
@@ -45,7 +45,7 @@ def eveapi_add(request, post_save_redirect='/', template='eve_api/add.html'):
                 else:
                     msg = "An issue was encountered while trying to import key %s, Please check that you are using the correct information and try again." % form.cleaned_data['api_user_id']
             messages.success(request, msg, fail_silently=True)
-            return redirect(post_save_redirect)
+            return HttpResponseRedirect(post_save_redirect)
     else:
         form = EveAPIForm(initial={'user': request.user.id }) # An unbound form
 
@@ -109,7 +109,7 @@ class EVEAPIDeleteView(DeleteView):
     def delete(self, request, *args, **kwargs):
         self.object = self.get_object()
         keyid = self.object.pk
-        if not gargoyle.is_active('eve-softkeydelete', request)
+        if not gargoyle.is_active('eve-softkeydelete', request):
             self.object.delete()
         else:
             self.object.user = None