Don't throw exception when approving a blog with no name
authorMagnus Hagander <magnus@hagander.net>
Sat, 24 Sep 2011 11:04:08 +0000 (13:04 +0200)
committerMagnus Hagander <magnus@hagander.net>
Sat, 24 Sep 2011 11:04:08 +0000 (13:04 +0200)
hamnadmin/register/admin.py

index a02811aada4a2da3b7d260980d6f1efcde00c8f5..69219c38842cf518828406ba8e917ac61eee210d 100644 (file)
@@ -12,12 +12,16 @@ class BlogAdminForm(forms.ModelForm):
        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, userid %s) has been %s." % (
                                        self.cleaned_data['feedurl'],
-                                       self.cleaned_data['name'],
+                                       name,
                                        self.cleaned_data['userid'],
                                        self.cleaned_data['approved'] and 'approved' or 'de-approved',
                                ), 'webmaster@postgresql.org', [settings.NOTIFYADDR])