Skip to content

Commit

Permalink
fix saving config issue
Browse files Browse the repository at this point in the history
  • Loading branch information
yuriiNazarenkoTine committed Apr 2, 2024
1 parent e90ed9b commit c15fbbf
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 644 deletions.
16 changes: 9 additions & 7 deletions src/app/rr-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -2033,11 +2033,13 @@ Ext.define("SYNOCOMMUNITY.RRManager.Setting.Main", {
doApply: async function () {
this.setStatusBusy();
try {
await this.setConf();
await this.updateAllForm();
await this.appWin.runScheduledTask('ApplyRRConfig');
this.clearStatusBusy();
this.setStatusOK();
(async () => {
await this.setConf();
await this.updateAllForm();
await this.appWin.runScheduledTask('ApplyRRConfig');
this.clearStatusBusy();
this.setStatusOK();
})();
} catch (e) {
SYNO.Debug(e);
this.clearStatusBusy();
Expand All @@ -2047,7 +2049,7 @@ Ext.define("SYNOCOMMUNITY.RRManager.Setting.Main", {
},
getParams: function () {
const generalTab = this.generalTab.getForm().getValues();
const iscsiTab = this.iscsiTab.getForm().getValues();
const rrConfigTab = this.rrConfigTab.getForm().getValues();

const synoInfoTab = this.synoInfoTab.getForm().getValues();
const synoInfoTabFixed = {
Expand All @@ -2056,7 +2058,7 @@ Ext.define("SYNOCOMMUNITY.RRManager.Setting.Main", {

var rrConfigJson = localStorage.getItem("rrConfig");
var rrConfig = JSON.parse(rrConfigJson);
return Object.assign(rrConfig?.user_config, generalTab, iscsiTab, synoInfoTabFixed);
return Object.assign(rrConfig?.user_config, generalTab, rrConfigTab, synoInfoTabFixed);
},
getConf: function () {
var rrConfigJson = localStorage.getItem("rrConfig");
Expand Down
Loading

0 comments on commit c15fbbf

Please sign in to comment.