--- a/src/ldt/ldt/ldt_utils/views.py Fri Nov 25 12:12:22 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/views.py Fri Nov 25 16:42:30 2011 +0100
@@ -163,11 +163,8 @@
show_username = False
if id_group > 0:
- # Get group, user and project_list
- grp = Group.objects.get(id=id_group) #@UndefinedVariable
- users = User.objects.filter(groups__in=[grp]) #@UndefinedVariable
- query &= Q(owner__in=users) #@UndefinedVariable
- project_list = Project.safe_objects.filter(query).extra(select={'lower_title': 'lower(title)'}).order_by('owner__username', 'lower_title') #@UndefinedVariable
+ grp = Group.objects.get(id=id_group)
+ project_list = get_objects_for_group(grp, 'ldt_utils.view_project')
show_username = True
else :
project_list = Project.safe_objects.filter(query) #@UndefinedVariable
@@ -1353,7 +1350,7 @@
@login_required
def leave_group(request, group_id, redirect=True):
if not request.user.is_regular:
- return HttpResponseServerError('<h1>User can leave a group.</h1>')
+ return HttpResponseServerError('<h1>User can not leave a group.</h1>')
group = get_object_or_404(Group, id=group_id)
redirect = boolean_convert(redirect)