summaryrefslogtreecommitdiff
path: root/coip/apps/membership/views.py
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-11-08 14:10:17 +0100
committerLeif Johansson <leifj@sunet.se>2011-11-08 14:10:42 +0100
commitbaf5f96d25c5f378169ac910f9535d29a9546e3e (patch)
tree7c16bc8a98d8a244a78577be8a625001757af89b /coip/apps/membership/views.py
parent9ba73ae91642d07aa78789e6e0cedf6ed6250300 (diff)
produce a basic group-oriented activity stream
Diffstat (limited to 'coip/apps/membership/views.py')
-rw-r--r--coip/apps/membership/views.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/coip/apps/membership/views.py b/coip/apps/membership/views.py
index 3d5a178..c1f3afb 100644
--- a/coip/apps/membership/views.py
+++ b/coip/apps/membership/views.py
@@ -33,7 +33,7 @@ def join(request,id,membername=None):
m = Membership(name=name,enabled=True)
form = MembershipForm(request.POST,instance=m)
if form.is_valid():
- add_member(name,form.cleaned_data['user'])
+ add_member(name,form.cleaned_data['user'],actor=request.user)
return HttpResponseRedirect(name.url())
else:
return respond_to(request,
@@ -42,7 +42,7 @@ def join(request,id,membername=None):
else:
if membername:
user = get_object_or_404(User,username=membername)
- add_member(name, user)
+ add_member(name, user,actor=request.user)
return HttpResponseRedirect(name.url())
else:
form = MembershipForm()
@@ -55,5 +55,5 @@ def leave(request,id,membername=None):
name = get_object_or_404(Name,pk=id)
if membername:
user = get_object_or_404(User,username=membername)
- remove_member(name, user)
+ remove_member(name, user,actor=request.user)
return HttpResponseRedirect(name.url())