change user_name still used as login and add display_name for dashboard view instead of username on login
This commit is contained in:
1 parent
7a562c18ec
commit
11b0ca26a5
33 files changed
+180
-145
No files matched your search
@@ -75,10 +75,10 @@ class Command(BaseCommand):
|
||||
defaults["managed_by"] = managed_by
|
||||
|
||||
user, created = User.objects.get_or_create(
|
||||
user_login=spec["user_name"],
|
||||
user_name=spec["user_name"],
|
||||
defaults={
|
||||
**defaults,
|
||||
"user_name": spec["user_name"],
|
||||
"display_name": spec["user_name"],
|
||||
},
|
||||
)
|
||||
user.status = spec["status"]
|
||||
@@ -93,7 +93,7 @@ class Command(BaseCommand):
|
||||
role = spec["status"]
|
||||
if user.is_superuser:
|
||||
role = f"{role}+superuser"
|
||||
link = f", managed_by={managed_by.user_name}" if managed_by else ""
|
||||
link = f", managed_by={managed_by.display_name}" if managed_by else ""
|
||||
action = "Created" if created else "Updated"
|
||||
self.stdout.write(
|
||||
f"{action} user {spec['user_name']} / {spec['password']} ({role}{link})"
|
||||
@@ -102,8 +102,8 @@ class Command(BaseCommand):
|
||||
|
||||
def _remove_legacy_staff(self, gm: User) -> None:
|
||||
staff = (
|
||||
User.objects.filter(user_login="staff").first()
|
||||
or User.objects.filter(user_name="staff").first()
|
||||
User.objects.filter(user_name="staff").first()
|
||||
or User.objects.filter(display_name="staff").first()
|
||||
)
|
||||
if not staff:
|
||||
return
|
||||
|
||||
Reference in new issue
Block a user