CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-10-01 09:38:55 +13:00
Code Issues Projects Releases Wiki Activity

PR feedback

Browse source
This commit is contained in:
Dean 2023-06-05 16:26:27 +01:00
parent f20653d4ca
commit 0a7669ad2d
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
packages/worker/src/api/controllers/global/configs.ts
View file

@ -337,6 +337,16 @@ export async function publicSettings(
)
}
// enrich the favicon url - empty url means deleted
const faviconUrl =
branding.faviconUrl && branding.faviconUrl !== ""
? objectStore.getGlobalFileUrl(
"settings",
"faviconUrl",
branding.faviconUrlEtag
)
: undefined
// google
const googleConfig = await configs.getGoogleConfig()
const googleDatasourceConfigured =
@ -360,15 +370,7 @@ export async function publicSettings(
config: {
...config,
...branding,
...(branding.faviconUrl && branding.faviconUrl !== ""
? {
faviconUrl: objectStore.getGlobalFileUrl(
"settings",
"faviconUrl",
branding.faviconUrlEtag
),
}
: { faviconUrl: undefined }),
...{ faviconUrl },
google,
googleDatasourceConfigured,
oidc,