mirror of
https://github.com/mailcow/mailcow-dockerized.git
synced 2025-12-13 01:45:59 +00:00
[Web] Fix JSON parsing issue for api requests
This commit is contained in:
@@ -158,9 +158,11 @@ $(document).ready(function() {
|
|||||||
var attr_to_merge = $(this).closest("form").serializeObject();
|
var attr_to_merge = $(this).closest("form").serializeObject();
|
||||||
// parse possible JSON Strings
|
// parse possible JSON Strings
|
||||||
for (var [key, value] of Object.entries(attr_to_merge)) {
|
for (var [key, value] of Object.entries(attr_to_merge)) {
|
||||||
try {
|
if (typeof value === "string" && /^[\[\{"].*[\}\]"]$/.test(value.trim())) {
|
||||||
attr_to_merge[key] = JSON.parse(attr_to_merge[key]);
|
try {
|
||||||
} catch {}
|
attr_to_merge[key] = JSON.parse(attr_to_merge[key]);
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
var api_attr = $.extend(api_attr, attr_to_merge)
|
var api_attr = $.extend(api_attr, attr_to_merge)
|
||||||
} else {
|
} else {
|
||||||
@@ -271,9 +273,11 @@ $(document).ready(function() {
|
|||||||
var attr_to_merge = $(this).closest("form").serializeObject();
|
var attr_to_merge = $(this).closest("form").serializeObject();
|
||||||
// parse possible JSON Strings
|
// parse possible JSON Strings
|
||||||
for (var [key, value] of Object.entries(attr_to_merge)) {
|
for (var [key, value] of Object.entries(attr_to_merge)) {
|
||||||
try {
|
if (typeof value === "string" && /^[\[\{"].*[\}\]"]$/.test(value.trim())) {
|
||||||
attr_to_merge[key] = JSON.parse(attr_to_merge[key]);
|
try {
|
||||||
} catch {}
|
attr_to_merge[key] = JSON.parse(attr_to_merge[key]);
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
var api_attr = $.extend(api_attr, attr_to_merge)
|
var api_attr = $.extend(api_attr, attr_to_merge)
|
||||||
} else {
|
} else {
|
||||||
@@ -312,7 +316,7 @@ $(document).ready(function() {
|
|||||||
var key = localStorage.key(i);
|
var key = localStorage.key(i);
|
||||||
if(/formcache/.test(key)) {
|
if(/formcache/.test(key)) {
|
||||||
localStorage.removeItem(key);
|
localStorage.removeItem(key);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user