From: Magnus Hagander Date: Sat, 24 Sep 2011 11:04:08 +0000 (+0200) Subject: Don't throw exception when approving a blog with no name X-Git-Url: http://git.postgresql.org/gitweb/static/session/%7B%7Bsession.id%7D%7D-%7B%7Bsession.title%7Cslugify%7D%7D?a=commitdiff_plain;h=acb32110947a73c8a369d8ad4200b144bf9c24ec;p=hamn.git Don't throw exception when approving a blog with no name --- diff --git a/hamnadmin/register/admin.py b/hamnadmin/register/admin.py index a02811a..69219c3 100644 --- a/hamnadmin/register/admin.py +++ b/hamnadmin/register/admin.py @@ -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 = "" 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])