mirror of https://gitlab.crans.org/bde/nk20
Merge branch 'fix_distinct' into 'master'
distinct on field not supported by sqlite See merge request bde/nk20!74
This commit is contained in:
commit
7d121da0a5
|
@ -139,8 +139,7 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView):
|
|||
| Q(name__regex=pattern)
|
||||
| Q(normalized_name__regex=Alias.normalize(pattern)))) \
|
||||
.filter(PermissionBackend.filter_queryset(self.request.user, Alias, "view"))\
|
||||
.filter(note__noteuser__user__profile__registration_valid=True)\
|
||||
.distinct("username")[:20]
|
||||
.distinct()[:20]
|
||||
for note in note_qs:
|
||||
note.type = "Adhérent"
|
||||
note.activity = activity
|
||||
|
|
|
@ -43,7 +43,7 @@ class PermissionBackend(ModelBackend):
|
|||
rolepermissions__role__membership__date_end__gte=datetime.date.today(),
|
||||
type=t,
|
||||
mask__rank__lte=get_current_session().get("permission_mask", 0),
|
||||
).distinct('club', 'pk',)
|
||||
).distinct()
|
||||
|
||||
@staticmethod
|
||||
def permissions(user, model, type):
|
||||
|
|
Loading…
Reference in New Issue