From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 22 Sep 2023 06:35:40 +0000 (-0700) Subject: Fix settings users initialization before groups X-Git-Tag: v2.0.0-beta.1~94 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54099d84416b448a969c96c5ede1843d3cf17464;p=thirdparty%2Fpaperless-ngx.git Fix settings users initialization before groups --- diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts index 520cd95204..daf4a66656 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.ts +++ b/src-ui/src/app/components/manage/settings/settings.component.ts @@ -346,6 +346,7 @@ export class SettingsComponent .subscribe({ next: (r) => { this.users = r.results + this.initialize(false) }, error: (e) => { this.toastService.showError($localize`Error retrieving users`, e) @@ -382,9 +383,8 @@ export class SettingsComponent } } - if (this.users && this.groups) { + if (this.users) { this.emptyGroup(this.usersGroup) - this.emptyGroup(this.groupsGroup) for (let user of this.users) { storeData.usersGroup[user.id.toString()] = { @@ -411,7 +411,9 @@ export class SettingsComponent }) ) } - + } + if (this.groups) { + this.emptyGroup(this.groupsGroup) for (let group of this.groups) { storeData.groupsGroup[group.id.toString()] = { id: group.id,