From d15c701510db63f6c1120e5f2f92909aa78d14b6 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Wed, 7 Dec 2022 14:59:27 -0800
Subject: [PATCH] Remove display_name property
---
src-ui/cypress/fixtures/ui_settings/settings.json | 1 -
src-ui/cypress/fixtures/ui_settings/settings_restricted.json | 1 -
src-ui/src/app/data/paperless-uisettings.ts | 1 -
src/documents/views.py | 4 ----
4 files changed, 7 deletions(-)
diff --git a/src-ui/cypress/fixtures/ui_settings/settings.json b/src-ui/cypress/fixtures/ui_settings/settings.json
index 4dfdcc931..bc86255fc 100644
--- a/src-ui/cypress/fixtures/ui_settings/settings.json
+++ b/src-ui/cypress/fixtures/ui_settings/settings.json
@@ -1,7 +1,6 @@
{
"user_id": 1,
"username": "admin",
- "display_name": "Admin",
"settings": {
"language": "",
"bulk_edit": {
diff --git a/src-ui/cypress/fixtures/ui_settings/settings_restricted.json b/src-ui/cypress/fixtures/ui_settings/settings_restricted.json
index f722ef25c..4bc8a2d41 100644
--- a/src-ui/cypress/fixtures/ui_settings/settings_restricted.json
+++ b/src-ui/cypress/fixtures/ui_settings/settings_restricted.json
@@ -1,7 +1,6 @@
{
"user_id": 1,
"username": "admin",
- "display_name": "Admin",
"settings": {
"language": "",
"bulk_edit": {
diff --git a/src-ui/src/app/data/paperless-uisettings.ts b/src-ui/src/app/data/paperless-uisettings.ts
index 378a51f82..640c779b9 100644
--- a/src-ui/src/app/data/paperless-uisettings.ts
+++ b/src-ui/src/app/data/paperless-uisettings.ts
@@ -1,7 +1,6 @@
export interface PaperlessUiSettings {
user_id: number
username: string
- display_name: string
settings: Object
permissions: string[]
}
diff --git a/src/documents/views.py b/src/documents/views.py
index 8b1dfedde..1bf393bc1 100644
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -872,9 +872,6 @@ class UiSettingsView(GenericAPIView):
serializer.is_valid(raise_exception=True)
user = User.objects.get(pk=request.user.id)
- displayname = user.username
- if user.first_name or user.last_name:
- displayname = " ".join([user.first_name, user.last_name])
ui_settings = {}
if hasattr(user, "ui_settings"):
ui_settings = user.ui_settings.settings
@@ -891,7 +888,6 @@ class UiSettingsView(GenericAPIView):
{
"user_id": user.id,
"username": user.username,
- "display_name": displayname,
"settings": ui_settings,
"permissions": roles,
},