From e8c3d84b2839f88ee5251dbb739f324adc32a0dd Mon Sep 17 00:00:00 2001
From: Kenneth Love <kenneth@gigantuan.net>
Date: Mon, 16 Jan 2012 18:09:44 -0800
Subject: [PATCH] cleaner form, properly sending. view has a bit more config

---
 djrill/admin.py                           |  2 +-
 djrill/templates/djrill/senders_list.html | 76 +++++++++++------------
 djrill/views.py                           | 12 +++-
 3 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/djrill/admin.py b/djrill/admin.py
index a9a2e52..43b6eb5 100644
--- a/djrill/admin.py
+++ b/djrill/admin.py
@@ -1,7 +1,7 @@
 from django.contrib import admin
 
 from djrill.views import (DjrillIndexView, DjrillSendersListView,
-                            DjrillDisableSenderView, DjrillVerifySenderView)
+                          DjrillDisableSenderView, DjrillVerifySenderView)
 
 admin.site.register_view("djrill/senders/", DjrillSendersListView.as_view(),
     "djrill_senders", "senders")
diff --git a/djrill/templates/djrill/senders_list.html b/djrill/templates/djrill/senders_list.html
index b58832e..8d73b76 100644
--- a/djrill/templates/djrill/senders_list.html
+++ b/djrill/templates/djrill/senders_list.html
@@ -58,47 +58,47 @@
 
       {% block filters %}{% endblock %}
 
-      <form id="changelist-form" action="" method="post">
-          {% csrf_token %}
-
-          {% block result_list %}
-            {% if objects %}
-            <div class="results">
-                <table cellspacing="0" id="result_list">
-                    <thead>
-                        <tr>
-                            {% for header in objects.0.keys %}
-                            <th scope="col">{{ header|capfirst }}</th>
-                            {% endfor %}
-                            <th></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                    {% for result in objects %}
-                        <tr class="{% cycle 'row1' 'row2' %}">
-                            {% for item in result.values %}
-                                <td>{{ item }}</td>
-                            {% endfor %}
+      {% block result_list %}
+        {% if objects %}
+        <div class="results">
+            <table cellspacing="0" id="result_list">
+                <thead>
+                    <tr>
+                        {% for header in objects.0.keys %}
+                        <th scope="col">{{ header|capfirst }}</th>
+                        {% endfor %}
+                        <th></th>
+                    </tr>
+                </thead>
+                <tbody>
+                {% for result in objects %}
+                    <tr class="{% cycle 'row1' 'row2' %}">
+                        {% for item in result.values %}
+                            <td>{{ item }}</td>
+                        {% endfor %}
+                        <td>
                             {% if result.is_enabled and result.approved_at %}
-                            <td>
-                                <form method="post" action="{% url "admin:djrill_disable_sender" %}">
-                                    <input type="hidden" name="email" value="{{ result.address }}">
-                                    {% csrf_token %}
-                                    <button>disable</buton>
-                                </form>
-                            </td>
+                            <form method="POST" action="{% url "admin:djrill_disable_sender" %}">
                             {% else %}
-                            <td><button>enable</button></td>
+                            <form method="POST" action="{% url "admin:djrill_verify_sender" %}">
                             {% endif %}
-                        </tr>
-                    {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-            {% endif %}
-          {% endblock %}
-          {% block pagination %}{% endblock %}
-      </form>
+                                <input type="hidden" name="email" value="{{ result.address }}">
+                                {% csrf_token %}
+                                {% if result.is_enabled and result.approved_at %}
+                                <button>disable</buton>
+                                {% else %}
+                                <button>enable</buton>
+                                {% endif %}
+                            </form>
+                        </td>
+                    </tr>
+                {% endfor %}
+                </tbody>
+            </table>
+        </div>
+        {% endif %}
+      {% endblock %}
+      {% block pagination %}{% endblock %}
     </div>
   </div>
 {% endblock %}
diff --git a/djrill/views.py b/djrill/views.py
index 6e3ee8d..eb2f4f2 100644
--- a/djrill/views.py
+++ b/djrill/views.py
@@ -1,5 +1,6 @@
 from django import forms
 from django.conf import settings
+from django.contrib import messages
 from django.core.exceptions import ImproperlyConfigured
 from django.core.urlresolvers import reverse
 from django.http import (HttpResponseForbidden, HttpResponseRedirect)
@@ -79,6 +80,8 @@ class DjrillSendersListView(DjrillAdminMedia, DjrillApiMixin,
 
 class DjrillSenderView(DjrillApiMixin, View):
     api_action = None
+    error_message = None
+    success_message = None
 
     def post(self, request):
         email = request.POST.get("email", None)
@@ -92,14 +95,21 @@ class DjrillSenderView(DjrillApiMixin, View):
                 data=json.dumps(payload))
 
             if req.status_code == 200:
-                return HttpResponseRedirect(reverse("admin:djrill_senders"))
+                messages.success(request, self.success_message)
+            else:
+                messages.error(request, self.error_message)
+            return HttpResponseRedirect(reverse("admin:djrill_senders"))
 
         return HttpResponseForbidden()
 
 
 class DjrillDisableSenderView(DjrillSenderView):
     api_action = "users/disable-sender.json"
+    error_message = "Sender was not disabled."
+    success_message = "Sender was disabled."
 
 
 class DjrillVerifySenderView(DjrillSenderView):
     api_action = "users/verify-sender.json"
+    error_message = "Sender was not verified."
+    success_message = "Sender was verified."