👔(backend) change field displayed on users endpoint
Change the field displayed on the users endpoint. We need the email field to be displayed.
This commit is contained in:
@@ -3,7 +3,6 @@ from django.db.models import Q
|
|||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
from rest_framework import exceptions, serializers
|
from rest_framework import exceptions, serializers
|
||||||
from timezone_field.rest_framework import TimeZoneSerializerField
|
|
||||||
|
|
||||||
from core import models
|
from core import models
|
||||||
|
|
||||||
@@ -11,18 +10,10 @@ from core import models
|
|||||||
class UserSerializer(serializers.ModelSerializer):
|
class UserSerializer(serializers.ModelSerializer):
|
||||||
"""Serialize users."""
|
"""Serialize users."""
|
||||||
|
|
||||||
timezone = TimeZoneSerializerField(use_pytz=False, required=True)
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = models.User
|
model = models.User
|
||||||
fields = [
|
fields = ["id", "email"]
|
||||||
"id",
|
read_only_fields = ["id", "email"]
|
||||||
"language",
|
|
||||||
"timezone",
|
|
||||||
"is_device",
|
|
||||||
"is_staff",
|
|
||||||
]
|
|
||||||
read_only_fields = ["id", "is_device", "is_staff"]
|
|
||||||
|
|
||||||
|
|
||||||
class BaseAccessSerializer(serializers.ModelSerializer):
|
class BaseAccessSerializer(serializers.ModelSerializer):
|
||||||
|
|||||||
@@ -118,10 +118,7 @@ def test_api_users_retrieve_me_authenticated():
|
|||||||
assert response.status_code == 200
|
assert response.status_code == 200
|
||||||
assert response.json() == {
|
assert response.json() == {
|
||||||
"id": str(user.id),
|
"id": str(user.id),
|
||||||
"language": user.language,
|
"email": user.email,
|
||||||
"timezone": str(user.timezone),
|
|
||||||
"is_device": False,
|
|
||||||
"is_staff": False,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -8,5 +8,4 @@
|
|||||||
export interface User {
|
export interface User {
|
||||||
id: string;
|
id: string;
|
||||||
email: string;
|
email: string;
|
||||||
name?: string;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,12 +51,12 @@ export const BlockNoteContent = ({ pad, provider }: BlockNoteContentProps) => {
|
|||||||
provider,
|
provider,
|
||||||
fragment: provider.doc.getXmlFragment('document-store'),
|
fragment: provider.doc.getXmlFragment('document-store'),
|
||||||
user: {
|
user: {
|
||||||
name: userData?.name || userData?.email || 'Anonymous',
|
name: userData?.email || 'Anonymous',
|
||||||
color: randomColor(),
|
color: randomColor(),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}, [provider, storedEditor, userData?.email, userData?.name]);
|
}, [provider, storedEditor, userData?.email]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setEditor(pad.id, editor);
|
setEditor(pad.id, editor);
|
||||||
|
|||||||
Reference in New Issue
Block a user