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

+4 -4
View File
@@ -57,7 +57,7 @@ class UserViewSet(viewsets.ModelViewSet):
def get_queryset(self):
qs = User.objects.select_related("managed_by", "managed_by_pending").order_by(
"user_name"
"display_name"
)
return filter_users_queryset(qs, self.request.user)
@@ -103,7 +103,7 @@ class UserViewSet(viewsets.ModelViewSet):
rows = User.objects.filter(
status=User.STATUS_BUH,
is_active=True,
).order_by("user_name")
).order_by("display_name")
return Response(UserSerializer(rows, many=True).data)
@action(detail=False, methods=["get"], url_path="pending-managed")
@@ -114,7 +114,7 @@ class UserViewSet(viewsets.ModelViewSet):
rows = User.objects.filter(
managed_by_pending=request.user,
status=User.STATUS_GM,
).select_related("managed_by", "managed_by_pending").order_by("user_name")
).select_related("managed_by", "managed_by_pending").order_by("display_name")
return Response(UserSerializer(rows, many=True).data)
@action(detail=False, methods=["post"], url_path="request-managed-by")
@@ -235,7 +235,7 @@ class LoginView(APIView):
serializer.is_valid(raise_exception=True)
user = authenticate(
request,
username=serializer.validated_data["user_login"],
username=serializer.validated_data["user_name"],
password=serializer.validated_data["password"],
)
if user is None: