phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
alex 2020-01-20 12:14:03 +03:00
commit 1bc7a9f13b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/account/views/back.py
View File

@ -24,8 +24,9 @@ class RoleTabRetrieveView(generics.GenericAPIView):
"""Overridden get_queryset method.""" """Overridden get_queryset method."""
additional_filters = {} additional_filters = {}
if self.request.user.userrole_set.country_admin_role().exists(): if (self.request.user.userrole_set.country_admin_role().exists() and
additional_filters.update({'userrole__country__code': self.request.country_code}) hasattr(self.request, 'country_code')):
additional_filters.update({'country__code': self.request.country_code})
return models.Role.objects.filter(**additional_filters)\ return models.Role.objects.filter(**additional_filters)\
.annotate_role_name()\ .annotate_role_name()\