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

Proposed by Bhargav
Status: Rejected
Rejected by: Terri
Proposed branch: lp:~bhargav-golla/postorius/bug-1294352
Merge into: lp:postorius
Diff against target: 34 lines (+15/-7)
1 file modified
src/postorius/views/user.py (+15/-7)
To merge this branch: bzr merge lp:~bhargav-golla/postorius/bug-1294352
Reviewer Review Type Date Requested Status
Terri Disapprove
Review via email: mp+212171@code.launchpad.net

Commit message

Description of the change

This merge fixes Bug 1294352

To post a comment you must log in.
Revision history for this message
Terri (terriko) wrote :

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

Fix bug 1294352

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
257 user = MailmanUser(display_name=form.cleaned_data['display_name'],257 user = MailmanUser(display_name=form.cleaned_data['display_name'],
258 email=form.cleaned_data['email'],258 email=form.cleaned_data['email'],
259 password=form.cleaned_data['password'])259 password=form.cleaned_data['password'])
260 user_obj = None
260 try:261 try:
261 user.save()262 user_obj = MailmanUser.objects.get(address=form.cleaned_data['email'])
262 except MailmanApiError:263 except Mailman404Error:
263 return utils.render_api_error(request)264 user_obj = None
264 except HTTPError, e:265 if user_obj is not None:
265 messages.error(request, e)266 messages.error(request, _("User with this e-mail already registered"))
266 else:267 else:
267 messages.success(request, _("New User registered"))268 try:
268 return redirect("user_index")269 user.save()
270 except MailmanApiError:
271 return utils.render_api_error(request)
272 except HTTPError, e:
273 messages.error(request, e)
274 else:
275 messages.success(request, _("New User registered"))
276 return redirect("user_index")
269 else:277 else:
270 form = UserNew()278 form = UserNew()
271 return render_to_response('postorius/users/new.html',279 return render_to_response('postorius/users/new.html',

Subscribers

People subscribed via source and target branches