From 2544f8ef5bc058afc8dd0efc9900bda5beba0a97 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Fri, 31 Jan 2020 13:06:03 +0300 Subject: [PATCH] added flag is_superuser to UserDetailView --- apps/account/serializers/common.py | 5 +++-- apps/search_indexes/serializers.py | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/account/serializers/common.py b/apps/account/serializers/common.py index 7ae6cb70..4e34ecc8 100644 --- a/apps/account/serializers/common.py +++ b/apps/account/serializers/common.py @@ -3,18 +3,17 @@ from django.conf import settings from django.contrib.auth import password_validation as password_validators from django.utils.translation import gettext_lazy as _ from fcm_django.models import FCMDevice +from phonenumber_field.serializerfields import PhoneNumberField from rest_framework import exceptions from rest_framework import serializers from rest_framework import validators as rest_validators from account import models, tasks -from account.models import User, Role from main.serializers.common import NavigationBarPermissionBaseSerializer from notification.models import Subscribe, Subscriber from utils import exceptions as utils_exceptions from utils import methods as utils_methods from utils.methods import generate_string_code -from phonenumber_field.serializerfields import PhoneNumberField def subscriptions_handler(subscriptions_list, user): @@ -85,6 +84,7 @@ class UserSerializer(serializers.ModelSerializer): phone_as_international = PhoneNumberField(source='phone.as_international', allow_null=True, read_only=True) + is_superuser = serializers.BooleanField(read_only=True) class Meta: model = models.User @@ -103,6 +103,7 @@ class UserSerializer(serializers.ModelSerializer): 'subscriptions', 'phone', 'phone_as_international', + 'is_superuser', ] extra_kwargs = { 'first_name': {'required': False, 'write_only': True, }, diff --git a/apps/search_indexes/serializers.py b/apps/search_indexes/serializers.py index d679e54f..7877a06e 100644 --- a/apps/search_indexes/serializers.py +++ b/apps/search_indexes/serializers.py @@ -1,12 +1,14 @@ """Search indexes serializers.""" -from rest_framework import serializers -from elasticsearch_dsl import AttrDict +from json import loads + from django_elasticsearch_dsl_drf.serializers import DocumentSerializer +from elasticsearch_dsl import AttrDict +from rest_framework import serializers + from news.serializers import NewsTypeSerializer from search_indexes.documents import EstablishmentDocument, NewsDocument from search_indexes.documents.product import ProductDocument from search_indexes.utils import get_translated_value -from json import loads class TagsDocumentSerializer(serializers.Serializer): @@ -132,7 +134,6 @@ class CityDocumentShortSerializer(serializers.Serializer): return get_translated_value(loads(obj.name)) if obj.name else None - class CountryDocumentSerializer(serializers.Serializer): id = serializers.IntegerField() code = serializers.CharField(allow_null=True)