Merge branch 'master' of github.com:brack3t/Djrill

This commit is contained in:
Kenneth Love
2012-01-16 17:50:33 -08:00
2 changed files with 14 additions and 3 deletions

View File

@@ -1,7 +1,7 @@
from django.contrib import admin from django.contrib import admin
from djrill.views import (DjrillIndexView, DjrillSendersListView, from djrill.views import (DjrillIndexView, DjrillSendersListView,
DjrillDisableSenderView) DjrillDisableSenderView, DjrillVerifySenderView)
admin.site.register_view("djrill/senders/", DjrillSendersListView.as_view(), admin.site.register_view("djrill/senders/", DjrillSendersListView.as_view(),
"djrill_senders", "senders") "djrill_senders", "senders")
@@ -10,3 +10,5 @@ admin.site.register_view("djrill/status/", DjrillIndexView.as_view(),
admin.site.register_url("djrill/disable/sender/", admin.site.register_url("djrill/disable/sender/",
DjrillDisableSenderView.as_view(), "djrill_disable_sender") DjrillDisableSenderView.as_view(), "djrill_disable_sender")
admin.site.register_url("djrill/verify/sender/",
DjrillVerifySenderView.as_view(), "djrill_verify_sender")

View File

@@ -77,7 +77,8 @@ class DjrillSendersListView(DjrillAdminMedia, DjrillApiMixin,
}) })
class DjrillDisableSenderView(DjrillApiMixin, View): class DjrillSenderView(DjrillApiMixin, View):
api_action = None
def post(self, request): def post(self, request):
email = request.POST.get("email", None) email = request.POST.get("email", None)
@@ -87,10 +88,18 @@ class DjrillDisableSenderView(DjrillApiMixin, View):
"key": self.api_key, "key": self.api_key,
"email": email "email": email
} }
req = requests.post("%s/users/disable-sender.json" % self.api_url, req = requests.post("%s/%s" % (self.api_url, self.api_action),
data=json.dumps(payload)) data=json.dumps(payload))
if req.status_code == 200: if req.status_code == 200:
return HttpResponseRedirect(reverse("admin:djrill_senders")) return HttpResponseRedirect(reverse("admin:djrill_senders"))
return HttpResponseForbidden() return HttpResponseForbidden()
class DjrillDisableSenderView(DjrillSenderView):
api_action = "users/disable-sender.json"
class DjrillVerifySenderView(DjrillSenderView):
api_action = "users/verify-sender.json"