Fix merge conflicts

This commit is contained in:
zandercymatics 2024-08-02 09:05:47 -06:00
parent dc70758603
commit 2769a9e5ba
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
7 changed files with 13 additions and 25 deletions

View file

@ -580,7 +580,7 @@ class DomainDataTypeUser(DomainDataType):
return Q(id__in=[])
else:
# Get all domains the user is associated with
return Q(domain__id__in=request.user.get_user_domain_ids())
return Q(domain__id__in=request.user.get_user_domain_ids(request))
class DomainDataFull(DomainExport):