From 765a66dc6892b2e5ac42510fc24483a5dc60cde8 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Mon, 20 Jan 2020 11:43:35 +0300 Subject: [PATCH 1/2] fix role counter --- apps/account/views/back.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/account/views/back.py b/apps/account/views/back.py index 1a411e9b..628dc486 100644 --- a/apps/account/views/back.py +++ b/apps/account/views/back.py @@ -24,8 +24,9 @@ class RoleTabRetrieveView(generics.GenericAPIView): """Overridden get_queryset method.""" additional_filters = {} - if self.request.user.userrole_set.country_admin_role().exists(): - additional_filters.update({'userrole__country__code': self.request.country_code}) + if (self.request.user.userrole_set.country_admin_role().exists() and + hasattr(self.request.user, 'country_code')): + additional_filters.update({'country__code': self.request.country_code}) return models.Role.objects.filter(**additional_filters)\ .annotate_role_name()\ From 452c6f22aebf095aeebf179115d23367c3b3e8b2 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Mon, 20 Jan 2020 11:45:26 +0300 Subject: [PATCH 2/2] fix role counter --- apps/account/views/back.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/account/views/back.py b/apps/account/views/back.py index 628dc486..1a3f5ccd 100644 --- a/apps/account/views/back.py +++ b/apps/account/views/back.py @@ -25,7 +25,7 @@ class RoleTabRetrieveView(generics.GenericAPIView): additional_filters = {} if (self.request.user.userrole_set.country_admin_role().exists() and - hasattr(self.request.user, 'country_code')): + hasattr(self.request, 'country_code')): additional_filters.update({'country__code': self.request.country_code}) return models.Role.objects.filter(**additional_filters)\