Fix server updates on docker
Which update changed this behaviour?
This commit is contained in:
parent
5c5b0df814
commit
467e67ff68
1 changed files with 9 additions and 1 deletions
|
|
@ -40,6 +40,7 @@ export class ManageSettingsComponent implements OnInit {
|
||||||
settingsForm: FormGroup = new FormGroup({});
|
settingsForm: FormGroup = new FormGroup({});
|
||||||
taskFrequencies: Array<string> = [];
|
taskFrequencies: Array<string> = [];
|
||||||
logLevels: Array<string> = [];
|
logLevels: Array<string> = [];
|
||||||
|
isDocker: boolean = false;
|
||||||
|
|
||||||
allowStatsTooltip = translate('manage-settings.allow-stats-tooltip-part-1') + ' <a href="' +
|
allowStatsTooltip = translate('manage-settings.allow-stats-tooltip-part-1') + ' <a href="' +
|
||||||
WikiLink.DataCollection +
|
WikiLink.DataCollection +
|
||||||
|
|
@ -94,6 +95,7 @@ export class ManageSettingsComponent implements OnInit {
|
||||||
).subscribe();
|
).subscribe();
|
||||||
|
|
||||||
this.serverService.getServerInfo().subscribe(info => {
|
this.serverService.getServerInfo().subscribe(info => {
|
||||||
|
this.isDocker = info.isDocker;
|
||||||
if (info.isDocker) {
|
if (info.isDocker) {
|
||||||
this.settingsForm.get('ipAddresses')?.disable();
|
this.settingsForm.get('ipAddresses')?.disable();
|
||||||
this.settingsForm.get('port')?.disable();
|
this.settingsForm.get('port')?.disable();
|
||||||
|
|
@ -130,12 +132,18 @@ export class ManageSettingsComponent implements OnInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
packData() {
|
packData() {
|
||||||
const modelSettings = this.settingsForm.value;
|
const modelSettings: ServerSettings = this.settingsForm.value;
|
||||||
modelSettings.bookmarksDirectory = this.serverSettings.bookmarksDirectory;
|
modelSettings.bookmarksDirectory = this.serverSettings.bookmarksDirectory;
|
||||||
modelSettings.smtpConfig = this.serverSettings.smtpConfig;
|
modelSettings.smtpConfig = this.serverSettings.smtpConfig;
|
||||||
modelSettings.installId = this.serverSettings.installId;
|
modelSettings.installId = this.serverSettings.installId;
|
||||||
modelSettings.installVersion = this.serverSettings.installVersion;
|
modelSettings.installVersion = this.serverSettings.installVersion;
|
||||||
|
|
||||||
|
// Disabled FormControls are not added to the value
|
||||||
|
if (this.isDocker) {
|
||||||
|
modelSettings.ipAddresses = this.serverSettings.ipAddresses;
|
||||||
|
modelSettings.port = this.serverSettings.port;
|
||||||
|
}
|
||||||
|
|
||||||
return modelSettings;
|
return modelSettings;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue