summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-09-22 16:09:53 +0200
committerLeif Johansson <leifj@sunet.se>2011-09-22 16:09:53 +0200
commitff616daf5f9aa1f348d23445b190a12b47821a57 (patch)
tree243088b03ce52eea33e8ccfc9debe6fd77fe5a4d
parent1d2a3f2403911e0b1ff99ffce808997a24661d15 (diff)
lookup user by username before adding to group
-rw-r--r--coip/apps/membership/views.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/coip/apps/membership/views.py b/coip/apps/membership/views.py
index 97c8c46..3d5a178 100644
--- a/coip/apps/membership/views.py
+++ b/coip/apps/membership/views.py
@@ -41,7 +41,8 @@ def join(request,id,membername=None):
{'form': form,'name': name, 'formtitle': 'Add a member to %s' % name.short})
else:
if membername:
- add_member(name, membername)
+ user = get_object_or_404(User,username=membername)
+ add_member(name, user)
return HttpResponseRedirect(name.url())
else:
form = MembershipForm()
@@ -53,9 +54,6 @@ def join(request,id,membername=None):
def leave(request,id,membername=None):
name = get_object_or_404(Name,pk=id)
if membername:
- try:
- member = User.objects.get(username=membername)
- remove_member(name, member)
- except ObjectDoesNotExist:
- pass
+ user = get_object_or_404(User,username=membername)
+ remove_member(name, user)
return HttpResponseRedirect(name.url())