Remove redundant code

This is now handled in the "proper" moderation interface, so no need
to send extra moderation notices.

diff --git a/hamnadmin/hamnadmin/local_settings.py.sample b/hamnadmin/hamnadmin/local_settings.py.sample
index 27650c7e61c10cc40b716b5bbeed92cd3b8cf8fd..7474f65c474f3fe31156cec4269abf29223ce084 100644 (file)
--- a/hamnadmin/hamnadmin/local_settings.py.sample
+++ b/hamnadmin/hamnadmin/local_settings.py.sample
@@ -8,8 +8,6 @@ DATABASES={
 
 DEBUG = True
 
-NOTIFYADDR='some@where.com'
-
 PGAUTH_REDIRECT="..."
 PGAUTH_KEY="..."
 

diff --git a/hamnadmin/hamnadmin/register/admin.py b/hamnadmin/hamnadmin/register/admin.py
index f9b6068461bf7c915412134099121a5909e5e116..4e2f05f4e08dd9e443881096c1e4c24535f477cb 100644 (file)
--- a/hamnadmin/hamnadmin/register/admin.py
+++ b/hamnadmin/hamnadmin/register/admin.py
@@ -1,37 +1,12 @@
 from django.contrib import admin
 from django import forms
-from django.core.mail import send_mail
 from django.conf import settings
 
 from hamnadmin.register.models import *
 
-class BlogAdminForm(forms.ModelForm):
-       class Meta:
-               model = Blog
-               exclude = []
-
-       def clean_approved(self):
-               if self.cleaned_data['approved'] != self.instance.approved:
-                       # Approved flag has changed, send an email
-                       if self.cleaned_data.has_key('name'):
-                               name = self.cleaned_data['name']
-                       else:
-                               name = "<empty>"
-                       send_mail('A planet blog has been %s' % (
-                               self.cleaned_data['approved'] and 'approved' or 'de-approved',
-                               ),
-                               "The blog %s (for user %s, user %s) has been %s." % (
-                                       self.cleaned_data['feedurl'],
-                                       name,
-                                       self.cleaned_data['user'],
-                                       self.cleaned_data['approved'] and 'approved' or 'de-approved',
-                               ), 'webmaster@postgresql.org', [settings.NOTIFYADDR])
-               return self.cleaned_data['approved']
-
 class BlogAdmin(admin.ModelAdmin):
        list_display = ['user', 'approved', 'name', 'feedurl', 'authorfilter', ]
        ordering = ['approved', 'name', ] #meh, multiple ordering not supported
-       form = BlogAdminForm
 
        def change_view(self, request, object_id, extra_context=None):
                blog = Blog(pk=object_id)