cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-10 01:43:43 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge commit master into google-sheets-lite

Browse Source
This commit is contained in:
arc-alex
2023-12-12 11:43:10 +01:00
parent b37494109a c4d65dbe5f
commit c5b8a133b5
77 changed files with 1740 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/utils/parser.ts
+2 -1
View File
@@ -29,6 +29,7 @@ import {
parseAliases,
parseProject,
parseOsc,
parseHttp,
parseRundown,
parseSettings,
parseUserFields,
@@ -368,7 +369,7 @@ export const parseJson = async (jsonData): Promise<DatabaseModel | null> => {
// Import OSC settings if any
returnData.osc = parseOsc(jsonData) ?? dbModel.osc;
// Import HTTP settings if any
// returnData.http = parseHttp(jsonData, enforce);
returnData.http = parseHttp(jsonData) ?? dbModel.http;
// Import GoogleSheet settings if any
returnData.googleSheet = parseGoogleSheet(jsonData, true);