forks/peertube
1
0
Fork 0
Code Releases Activity

Fix updating instance custom config

Browse source
This commit is contained in:
Chocobozzz 2024-08-16 10:43:24 +02:00
parent 16d9204ea8
commit d97484c2f7
No known key found for this signature in database
GPG key ID: 583A612D890159BE
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
View file

@ -40,6 +40,7 @@ import { EditHomepageComponent } from './edit-homepage.component'
import { EditInstanceInformationComponent } from './edit-instance-information.component' import { EditInstanceInformationComponent } from './edit-instance-information.component'
import { EditLiveConfigurationComponent } from './edit-live-configuration.component' import { EditLiveConfigurationComponent } from './edit-live-configuration.component'
import { EditVODTranscodingComponent } from './edit-vod-transcoding.component' import { EditVODTranscodingComponent } from './edit-vod-transcoding.component'
import merge from 'lodash-es/merge'
type ComponentCustomConfig = CustomConfig & { type ComponentCustomConfig = CustomConfig & {
instanceCustomHomepage: CustomPage instanceCustomHomepage: CustomPage
@ -368,7 +369,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
this.forceCheck() this.forceCheck()
if (!this.form.valid) return if (!this.form.valid) return
const value: ComponentCustomConfig = this.form.getRawValue() const value: ComponentCustomConfig = merge(this.customConfig, this.form.getRawValue())
forkJoin([ forkJoin([
this.configService.updateCustomConfig(omit(value, 'instanceCustomHomepage')), this.configService.updateCustomConfig(omit(value, 'instanceCustomHomepage')),
@ -376,9 +377,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
]) ])
.subscribe({ .subscribe({
next: ([ resConfig ]) => { next: ([ resConfig ]) => {
const instanceCustomHomepage = { const instanceCustomHomepage = { content: value.instanceCustomHomepage.content }
content: value.instanceCustomHomepage.content
}
this.customConfig = { ...resConfig, instanceCustomHomepage } this.customConfig = { ...resConfig, instanceCustomHomepage }