Skip to content
Snippets Groups Projects

Resolve "Add rules and permissions"

Merged Jonathan Weth requested to merge 73-add-rules-and-permissions into master
Compare and Show latest version
2 files
+ 4
3
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -4,6 +4,7 @@ from django import forms
from django.core.exceptions import ValidationError
from django.db.models import Count, Q
from django.utils.translation import gettext_lazy as _
from django_global_request.middleware import get_request
from django_select2.forms import Select2Widget
from guardian.shortcuts import get_objects_for_user
@@ -75,7 +76,7 @@ class SelectForm(forms.Form):
return data
def __init__(self, *args, **kwargs):
self.request = kwargs.pop("request")
self.request = get_request()
super().__init__(*args, **kwargs)
person = self.request.user.person
@@ -98,7 +99,7 @@ class SelectForm(forms.Form):
).values_list("pk", flat=True)
)
).union(group_qs.filter(Q(members=person) | Q(owners=person)))
self.fields["group"].queryset = group_qs
self.fields["group"].queryset = group_qs.distinct()
teacher_qs = Person.objects.annotate(
lessons_count=Count("lessons_as_teacher")
Loading