Merge lp:~bhargav-golla/postorius/bug-1294352 into lp:postorius

[Bhargav]

Fixes Bug 1294352

This merge fixes Bug 1294352

[Terri (terriko)]

This is actually perfectly good code, but since we've removed the user adding feature from the interface, there's no need for a fix any more. Thanks!

review: Disapprove

Unmerged revisions

161. By Bhargav on 2014-03-21

Fix bug 1294352

=== modified file 'src/postorius/views/user.py'
--- src/postorius/views/user.py	2014-03-15 21:36:39 +0000
+++ src/postorius/views/user.py	2014-03-21 14:32:17 +0000
@@ -257,15 +257,23 @@
             user = MailmanUser(display_name=form.cleaned_data['display_name'],
                                email=form.cleaned_data['email'],
                                password=form.cleaned_data['password'])
+            user_obj = None
             try:
-                user.save()
-            except MailmanApiError:
-                return utils.render_api_error(request)
-            except HTTPError, e:
-                messages.error(request, e)
+                user_obj = MailmanUser.objects.get(address=form.cleaned_data['email'])
+            except Mailman404Error:
+                user_obj = None
+            if user_obj is not None:
+                messages.error(request, _("User with this e-mail already registered"))
             else:
-                messages.success(request, _("New User registered"))
-            return redirect("user_index")
+                try:
+                    user.save()
+                except MailmanApiError:
+                    return utils.render_api_error(request)
+                except HTTPError, e:
+                    messages.error(request, e)
+                else:
+                    messages.success(request, _("New User registered"))
+                return redirect("user_index")
     else:
         form = UserNew()
     return render_to_response('postorius/users/new.html',