smokephil/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-12-12 17:47:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge frontend user model

Browse source
This commit is contained in:
Michael Shamoon 2022-11-13 21:31:46 -08:00
parent fdaf9e9b46
commit 10f36870e6
6 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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 {
if (!comment.user) return ''
let nameComponents = []
if (comment.user.firstname) nameComponents.unshift(comment.user.firstname)
if (comment.user.lastname) nameComponents.unshift(comment.user.lastname)
if (comment.user.first_name) nameComponents.unshift(comment.user.first_name)
if (comment.user.last_name) nameComponents.unshift(comment.user.last_name)
if (comment.user.username) {
if (nameComponents.length > 0)
nameComponents.push(`(${comment.user.username})`)