paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-10-30 03:56:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge frontend user model

Browse Source
This commit is contained in:
Michael Shamoon
2022-11-13 21:31:46 -08:00
parent 9744376f80
commit 279263fadf
6 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src-ui/cypress/fixtures/documents/1/comments.json
View File

@@ -6,8 +6,8 @@
"user": { "user": {
"id": 1, "id": 1,
"username": "user2", "username": "user2",
"firstname": "", "first_name": "",
"lastname": "" "last_name": ""
} }
}, },
{ {
@@ -17,8 +17,8 @@
"user": { "user": {
"id": 2, "id": 2,
"username": "user1", "username": "user1",
"firstname": "", "first_name": "",
"lastname": "" "last_name": ""
} }
}, },
{ {
@@ -28,8 +28,8 @@
"user": { "user": {
"id": 2, "id": 2,
"username": "user33", "username": "user33",
"firstname": "", "first_name": "",
"lastname": "" "last_name": ""
} }
}, },
{ {
@@ -39,8 +39,8 @@
"user": { "user": {
"id": 3, "id": 3,
"username": "admin", "username": "admin",
"firstname": "", "first_name": "",
"lastname": "" "last_name": ""
} }
} }
] ]

4
src-ui/src/app/components/document-comments/document-comments.component.ts
View File

@@ -92,8 +92,8 @@ export class DocumentCommentsComponent extends ComponentWithPermissions {
displayName(comment: PaperlessDocumentComment): string { displayName(comment: PaperlessDocumentComment): string {
if (!comment.user) return '' if (!comment.user) return ''
let nameComponents = [] let nameComponents = []
if (comment.user.firstname) nameComponents.unshift(comment.user.firstname) if (comment.user.first_name) nameComponents.unshift(comment.user.first_name)
if (comment.user.lastname) nameComponents.unshift(comment.user.lastname) if (comment.user.last_name) nameComponents.unshift(comment.user.last_name)
if (comment.user.username) { if (comment.user.username) {
if (nameComponents.length > 0) if (nameComponents.length > 0)
nameComponents.push(`(${comment.user.username})`) nameComponents.push(`(${comment.user.username})`)

4
src-ui/src/app/data/paperless-document-comment.ts
View File

@@ -1,8 +1,8 @@
import { ObjectWithId } from './object-with-id' import { ObjectWithId } from './object-with-id'
import { User } from './user' import { PaperlessUser } from './paperless-user'
export interface PaperlessDocumentComment extends ObjectWithId { export interface PaperlessDocumentComment extends ObjectWithId {
created?: Date created?: Date
comment?: string comment?: string
user?: User user?: PaperlessUser
} }

7
src-ui/src/app/data/user.ts
View File

@@ -1,7 +0,0 @@
import { ObjectWithId } from './object-with-id'
export interface User extends ObjectWithId {
username: string
firstname: string
lastname: string
}

4
src/documents/tests/test_api.py
View File

@@ -1400,8 +1400,8 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
"user": { "user": {
"id": comment.user.id, "id": comment.user.id,
"username": comment.user.username, "username": comment.user.username,
"firstname": comment.user.first_name, "first_name": comment.user.first_name,
"lastname": comment.user.last_name, "last_name": comment.user.last_name,
}, },
}, },
) )

4
src/documents/views.py
View File

@@ -400,8 +400,8 @@ class DocumentViewSet(
"user": { "user": {
"id": c.user.id, "id": c.user.id,
"username": c.user.username, "username": c.user.username,
"firstname": c.user.first_name, "first_name": c.user.first_name,
"lastname": c.user.last_name, "last_name": c.user.last_name,
}, },
} }
for c in Comment.objects.filter(document=doc).order_by("-created") for c in Comment.objects.filter(document=doc).order_by("-created")