paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-12-18 01:41:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix some merge errors, integrate permissions for frontend mail

Browse Source
This commit is contained in:
Michael Shamoon
2022-12-05 12:28:44 -08:00
parent 23978410a3
commit 94eadc76b5
3 changed files with 91 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src-ui/src/app/components/manage/settings/settings.component.ts
View File

@@ -246,14 +246,14 @@ export class SettingsComponent
this.initialize(false)
})
} else if (
(navID == SettingsNavIDs.UsersGroups && !this.users) ||
!this.groups
navID == SettingsNavIDs.UsersGroups &&
(!this.users || !this.groups)
) {
this.usersService.listAll().subscribe((r) => {
this.users = r.results
this.groupsService.listAll().subscribe((r) => {
this.groups = r.results
this.initialize()
this.initialize(false)
})
})
} else if (
@@ -724,6 +724,10 @@ export class SettingsComponent
})
}
getGroupName(id: number): string {
return this.groups?.find((g) => g.id === id)?.name ?? ''
}
editMailAccount(account: PaperlessMailAccount) {
const modal = this.modalService.open(MailAccountEditDialogComponent, {
backdrop: 'static',