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

fix merge conflict for edit dialog succeeded and pw not required

Browse Source
This commit is contained in:
Michael Shamoon 2023-01-01 17:55:52 -08:00
parent a08467342c
commit d840308392
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -620,7 +620,7 @@ export class SettingsComponent
}) })
modal.componentInstance.dialogMode = user ? 'edit' : 'create' modal.componentInstance.dialogMode = user ? 'edit' : 'create'
modal.componentInstance.object = user modal.componentInstance.object = user
modal.componentInstance.success modal.componentInstance.succeeded
.pipe(takeUntil(this.unsubscribeNotifier)) .pipe(takeUntil(this.unsubscribeNotifier))
.subscribe({ .subscribe({
next: (newUser) => { next: (newUser) => {
@ -676,7 +676,7 @@ export class SettingsComponent
}) })
modal.componentInstance.dialogMode = group ? 'edit' : 'create' modal.componentInstance.dialogMode = group ? 'edit' : 'create'
modal.componentInstance.object = group modal.componentInstance.object = group
modal.componentInstance.success modal.componentInstance.succeeded
.pipe(takeUntil(this.unsubscribeNotifier)) .pipe(takeUntil(this.unsubscribeNotifier))
.subscribe({ .subscribe({
next: (newGroup) => { next: (newGroup) => {

2
src/paperless/serialisers.py
View File

@ -18,7 +18,7 @@ class ObfuscatedUserPasswordField(serializers.Field):
class UserSerializer(serializers.ModelSerializer): class UserSerializer(serializers.ModelSerializer):
password = ObfuscatedUserPasswordField() password = ObfuscatedUserPasswordField(required=False)
user_permissions = serializers.SlugRelatedField( user_permissions = serializers.SlugRelatedField(
many=True, many=True,
queryset=Permission.objects.all(), queryset=Permission.objects.all(),