blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 00:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug: Deepmerge on update

Browse Source
This commit is contained in:
cgfhtw
2022-10-12 10:29:52 +02:00
parent a468338ead
commit dd4d71bd7d
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/components/Dashboard/Dashboard.js
+3 -3
View File
@@ -1,5 +1,6 @@
import DashboardSection from "./Section.js";
import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
import ObjectUtils from "../../composables/ObjectUtils.js";
export default {
props: [
@@ -52,7 +53,6 @@ export default {
newId = i;
break;
}
console.log(newId);
this.tmpCreate.widget.id = newId;
this.sections.forEach(section => {
if (section.name == this.tmpCreate.section_name)
@@ -73,7 +73,7 @@ export default {
if (this.sections[i].name == section_name) {
for (var wid in this.sections[i].widgets) {
if (this.sections[i].widgets[wid].id == k) {
payload[k] = {...this.sections[i].widgets[wid], ...payload[k]};
payload[k] = ObjectUtils.mergeDeep(this.sections[i].widgets[wid], payload[k]);
break;
}
}
@@ -82,7 +82,7 @@ export default {
}
payload[k].widgetid = k;
}
return axios.post(this.apiurl + '/Config/addWidgetsToUserOverride', {
axios.post(this.apiurl + '/Config/addWidgetsToUserOverride', {
db: this.dashboard,
uid: 'ma0168',
funktion_kurzbz: section_name,