Revision 29b0ec5a snf-astakos-app/astakos/im/views.py
b/snf-astakos-app/astakos/im/views.py | ||
---|---|---|
58 | 58 |
from django.views.generic.list_detail import object_list |
59 | 59 |
from django.core.xheaders import populate_xheaders |
60 | 60 |
from django.core.exceptions import ValidationError, PermissionDenied |
61 |
|
|
62 | 61 |
from django.template.loader import render_to_string |
63 | 62 |
from django.views.decorators.http import require_http_methods |
64 |
from astakos.im.activation_backends import get_backend, SimpleBackend
|
|
63 |
from django.db.models import Q
|
|
65 | 64 |
|
65 |
from astakos.im.activation_backends import get_backend, SimpleBackend |
|
66 | 66 |
from astakos.im.models import (AstakosUser, ApprovalTerms, AstakosGroup, |
67 | 67 |
EmailChange, GroupKind, Membership, |
68 | 68 |
RESOURCE_SEPARATOR, AstakosUserAuthProvider) |
... | ... | |
937 | 937 |
LEFT JOIN auth_user as owner ON ( |
938 | 938 |
im_astakosuser_owner.astakosuser_id = owner.id) |
939 | 939 |
WHERE im_membership.person_id = %(userid)s |
940 |
AND im_groupkind.name != 'default' |
|
940 | 941 |
""" |
941 | 942 |
params = {'userid':request.user.id} |
942 | 943 |
|
... | ... | |
1073 | 1074 |
sorting = 'groupname' |
1074 | 1075 |
if q: |
1075 | 1076 |
queryset = AstakosGroup.objects.select_related() |
1077 |
queryset = queryset.filter(~Q(kind__name='default')) |
|
1076 | 1078 |
queryset = queryset.filter(name__contains=q) |
1077 | 1079 |
queryset = queryset.filter(approval_date__isnull=False) |
1078 | 1080 |
queryset = queryset.extra(select={ |
... | ... | |
1130 | 1132 |
@login_required |
1131 | 1133 |
def group_all(request, extra_context=None, **kwargs): |
1132 | 1134 |
q = AstakosGroup.objects.select_related() |
1135 |
q = q.filter(~Q(kind__name='default')) |
|
1133 | 1136 |
q = q.filter(approval_date__isnull=False) |
1134 | 1137 |
q = q.extra(select={ |
1135 | 1138 |
'groupname': "auth_group.name", |
Also available in: Unified diff