change user_name still used as login and add display_name for dashboard view instead of username on login

This commit is contained in:
Alberto-Audrix committed 2026-09-10 10:51:51 +07:00
1 parent 7a562c18ec
commit 11b0ca26a5
33 files changed
+180 -145

No files matched your search

+9 -9
View File
@@ -19,19 +19,19 @@ class UserSerializer(PkAsIdMixin, serializers.ModelSerializer):
required=False,
)
managed_by_name = serializers.CharField(
source="managed_by.user_name", read_only=True, allow_null=True
source="managed_by.display_name", read_only=True, allow_null=True
)
managed_by_pending = serializers.PrimaryKeyRelatedField(read_only=True)
managed_by_pending_name = serializers.CharField(
source="managed_by_pending.user_name", read_only=True, allow_null=True
source="managed_by_pending.display_name", read_only=True, allow_null=True
)
class Meta:
model = User
fields = [
"id",
"user_login",
"user_name",
"display_name",
"status",
"is_superuser",
"managed_by",
@@ -64,19 +64,19 @@ class UserWriteSerializer(PkAsIdMixin, serializers.ModelSerializer):
required=False,
)
managed_by_name = serializers.CharField(
source="managed_by.user_name", read_only=True, allow_null=True
source="managed_by.display_name", read_only=True, allow_null=True
)
managed_by_pending = serializers.PrimaryKeyRelatedField(read_only=True)
managed_by_pending_name = serializers.CharField(
source="managed_by_pending.user_name", read_only=True, allow_null=True
source="managed_by_pending.display_name", read_only=True, allow_null=True
)
class Meta:
model = User
fields = [
"id",
"user_login",
"user_name",
"display_name",
"status",
"is_superuser",
"password",
@@ -136,9 +136,9 @@ class UserWriteSerializer(PkAsIdMixin, serializers.ModelSerializer):
def create(self, validated_data):
password = validated_data.pop("password")
user_login = validated_data.pop("user_login")
user_name = validated_data.pop("user_name")
return User.objects.create_user(
user_login=user_login, password=password, **validated_data
user_name=user_name, password=password, **validated_data
)
def update(self, instance, validated_data):
@@ -161,7 +161,7 @@ class SetPasswordSerializer(serializers.Serializer):
class LoginSerializer(serializers.Serializer):
user_login = serializers.CharField(max_length=30)
user_name = serializers.CharField(max_length=30)
password = serializers.CharField(write_only=True)