From 9255b90b51f23ffd571929b0de8bbcac663af4aa Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Wed, 21 Sep 2011 13:41:08 +0100 Subject: [PATCH] Skip non-public and non member managed groups --- app/groups/views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/groups/views.py b/app/groups/views.py index b715988..a101401 100644 --- a/app/groups/views.py +++ b/app/groups/views.py @@ -41,12 +41,14 @@ def group_list(request): status = None requestable = False - if group.groupinformation and group.groupinformation.requestable and not group.groupinformation.type == GROUP_TYPE_MANAGED: + if group.groupinformation and group.groupinformation.requestable: if group.groupinformation.parent: if group.groupinformation.parent in request.user.groups.all(): requestable = True else: requestable = True + elif not group.groupinformation.public or (group.groupinformation.type == GROUP_TYPE_MANAGED and not status): + continue fixed = not group.groupinformation.type == GROUP_TYPE_PERMISSION pending = group.requests.filter(status=REQUEST_PENDING,user=request.user).count()