Queryset fail
This commit is contained in:
1 parent
9b0415d877
commit
ca74324175
2 files changed
+5
-5
No files matched your search
@@ -46,7 +46,7 @@ class DestinationPrefixOwner(permissions.BasePermission):
|
||||
|
||||
my_groups = request.user.groups.all()
|
||||
# Look for mailinglist prefixes
|
||||
my_prefixes = OrgUnit.objects.filter(admin_groups__in=my_groups).distinct().exclude(prefix__isnull=True, is_active=True).values_list('prefix', flat=True)
|
||||
my_prefixes = OrgUnit.objects.filter(admin_groups__in=my_groups).distinct().exclude(prefix__isnull=True).exclude(is_active=False).values_list('prefix', flat=True)
|
||||
if len(my_prefixes) == 0:
|
||||
return False
|
||||
# Prepare regular expression
|
||||
|
||||
+4
-4
@@ -61,9 +61,9 @@ class ForwardsViewSet(viewsets.ViewSet):
|
||||
|
||||
# Look for mailinglist prefixes
|
||||
if request.user.is_superuser:
|
||||
my_prefixes = OrgUnit.objects.exclude(prefix__isnull=True, is_active=True).distinct().values_list('prefix', flat=True)
|
||||
my_prefixes = OrgUnit.objects.exclude(prefix__isnull=True).exclude(is_active=False).distinct().values_list('prefix', flat=True)
|
||||
else:
|
||||
my_prefixes = OrgUnit.objects.filter(admin_groups__in=my_groups).distinct().exclude(prefix__isnull=True, is_active=True).values_list('prefix', flat=True)
|
||||
my_prefixes = OrgUnit.objects.filter(admin_groups__in=my_groups).distinct().exclude(prefix__isnull=True).exclude(is_active=False).values_list('prefix', flat=True)
|
||||
# Prepare regular expression
|
||||
regexp = '|'.join(['{0}-'.format(p) for p in my_prefixes])
|
||||
|
||||
@@ -138,9 +138,9 @@ class MyOrgUnitViewSet(viewsets.ReadOnlyModelViewSet):
|
||||
|
||||
def get_queryset(self):
|
||||
if self.request.user.is_superuser:
|
||||
return OrgUnit.objects.exclude(prefix__isnull=True, is_active=True).distinct()
|
||||
return OrgUnit.objects.exclude(prefix__isnull=True).exclude(is_active=False).distinct()
|
||||
|
||||
return OrgUnit.objects.filter(admin_groups__in=self.request.user.groups.values('id')).exclude(prefix__isnull=True, is_active=True).distinct()
|
||||
return OrgUnit.objects.filter(admin_groups__in=self.request.user.groups.values('id')).exclude(prefix__isnull=True).exclude(is_active=False).distinct()
|
||||
|
||||
|
||||
class OrgUnitViewSet(viewsets.ReadOnlyModelViewSet):
|
||||
|
||||
Reference in new issue
Block a user