nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-15 23:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show requestable groups on the group list, even if they're private

Browse Source
This commit is contained in:
Andrew Williams
2011-09-21 13:11:48 +01:00
parent 3631ca2ec9
commit e11016ef42
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/groups/views.py
View File

@@ -24,6 +24,7 @@ def group_list(request):
else: else:
groups = Group.objects.select_related('groupinformation').filter(Q(groupinformation__type=GROUP_TYPE_PERMISSION) | groups = Group.objects.select_related('groupinformation').filter(Q(groupinformation__type=GROUP_TYPE_PERMISSION) |
Q(groupinformation__public=True) | Q(groupinformation__public=True) |
Q(groupinformation__requestable=True) |
Q(groupinformation__admins__in=[request.user]) | Q(groupinformation__admins__in=[request.user]) |
Q(user__in=[request.user])) Q(user__in=[request.user]))
@@ -43,7 +44,10 @@ def group_list(request):
requestable = False requestable = False
if group.groupinformation and group.groupinformation.requestable and not group.groupinformation.type == GROUP_TYPE_MANAGED: if group.groupinformation and group.groupinformation.requestable and not group.groupinformation.type == GROUP_TYPE_MANAGED:
if not group.groupinformation.parent or group.groupinformation.parent in request.user.groups.all(): if group.groupinformation.parent:
if group.groupinformation.parent in request.user.groups.all():
requestable = True
else:
requestable = True requestable = True
fixed = not group.groupinformation.type == GROUP_TYPE_PERMISSION fixed = not group.groupinformation.type == GROUP_TYPE_PERMISSION