Release v2.6.19
This commit is contained in:
@@ -308,6 +308,49 @@ async function buildTemplateContent(pool, template, body, filesByField, existing
|
||||
value: submitted === undefined ? String(current.value !== undefined ? current.value : current.text !== undefined ? current.text : '') : String(submitted || ''),
|
||||
timezone: timezoneValue === undefined || timezoneValue === null ? String(current.timezone || current.time_zone || '') : String(timezoneValue || '').trim()
|
||||
};
|
||||
} else if (region.region_type === 'timetable') {
|
||||
const current = existingContent && existingContent[region.region_key] && typeof existingContent[region.region_key] === 'object' ? existingContent[region.region_key] : {};
|
||||
const suffix = '_' + region.id;
|
||||
const generic = {};
|
||||
const submittedText = body[`region_text_${region.id}`];
|
||||
const normalizedText = submittedText === undefined ? String(current.text !== undefined ? current.text : current.value !== undefined ? current.value : '') : String(submittedText || '');
|
||||
|
||||
Object.keys(body || {}).forEach((key) => {
|
||||
if (!key.startsWith('region_') || !key.endsWith(suffix)) {
|
||||
return;
|
||||
}
|
||||
|
||||
const field = key.slice('region_'.length, -suffix.length);
|
||||
if (!field || field === 'type' || field === 'key' || field === 'name' || field === 'label') {
|
||||
return;
|
||||
}
|
||||
|
||||
generic[field] = body[key];
|
||||
});
|
||||
|
||||
if (Object.prototype.hasOwnProperty.call(generic, 'timetable_display_mode')) {
|
||||
generic.display_mode = generic.timetable_display_mode;
|
||||
delete generic.timetable_display_mode;
|
||||
}
|
||||
|
||||
if (Object.prototype.hasOwnProperty.call(generic, 'timetable_max_items')) {
|
||||
generic.max_items = generic.timetable_max_items;
|
||||
delete generic.timetable_max_items;
|
||||
}
|
||||
|
||||
Object.keys(current).forEach((key) => {
|
||||
if (generic[key] === undefined) {
|
||||
generic[key] = current[key];
|
||||
}
|
||||
});
|
||||
|
||||
delete generic.timetable_display_mode;
|
||||
delete generic.timetable_max_items;
|
||||
|
||||
generic.text = normalizedText;
|
||||
generic.value = normalizedText;
|
||||
generic.type = region.region_type;
|
||||
content[region.region_key] = generic;
|
||||
} else if (region.region_type === 'rss') {
|
||||
const submitted = body[`region_text_${region.id}`];
|
||||
const current = existingContent && existingContent[region.region_key] ? existingContent[region.region_key] : {};
|
||||
|
||||
Reference in New Issue
Block a user