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

roles for user csv

Browse Source
This commit is contained in:
alex 2020-01-30 17:01:27 +03:00
parent e6de2cc4f9
commit 40fa4c543b
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/account/models.py
View File

@ -481,6 +481,17 @@ class User(AbstractUser):
return self.last_country.country.name_translated return self.last_country.country.name_translated
return None return None
@property
def locale_roles(self):
"""
Str roles, like "Standard user: at, Moderator: ru" for сsv api method
"""
result_list = []
roles = self.roles.all()
for role in roles:
result_list.append(f'{role.get_role_display()}: {role.country.code}')
return ', '.join(result_list)
class UserRoleQueryset(models.QuerySet): class UserRoleQueryset(models.QuerySet):
"""QuerySet for model UserRole.""" """QuerySet for model UserRole."""

3
apps/account/serializers/back.py
View File

@ -155,6 +155,7 @@ class UserCSVSerializer(serializers.ModelSerializer):
created_at = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", read_only=True, source='date_joined') created_at = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", read_only=True, source='date_joined')
last_seen_at = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", read_only=True, source='last_login') last_seen_at = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", read_only=True, source='last_login')
country = serializers.CharField(allow_blank=True, allow_null=True, source='country_name') country = serializers.CharField(allow_blank=True, allow_null=True, source='country_name')
roles_list = serializers.CharField(allow_blank=True, allow_null=True, source='locale_roles')
class Meta: class Meta:
model = models.User model = models.User
@ -168,5 +169,5 @@ class UserCSVSerializer(serializers.ModelSerializer):
'created_at', 'created_at',
'last_seen_at', 'last_seen_at',
'last_ip', 'last_ip',
'roles', 'roles_list',
] ]