if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-12-27 17:31:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1817 from NguyenTranHoangSym/SDA-4113_reflog

Browse Source 
SDA-4113: Update the remained commit havent pushed
This commit is contained in:
NguyenTranHoangSym 2023-03-30 15:22:42 +07:00 committed by GitHub
commit eeb88fbdb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/window-handler.ts
View File

@ -553,8 +553,9 @@ export class WindowHandler {
const defaultUrl = 'my.symphony.com'; const defaultUrl = 'my.symphony.com';
const podUrl = this.userConfig.url const podUrl = this.userConfig.url
? this.userConfig.url ? this.userConfig.url
: !this.globalConfig.url.includes(defaultUrl) && : !this.globalConfig.url.includes(defaultUrl)
this.globalConfig.url; ? this.globalConfig.url
: undefined;
this.mainWebContents.send('page-load-welcome', { this.mainWebContents.send('page-load-welcome', {
locale: i18n.getLocale(), locale: i18n.getLocale(),
resources: i18n.loadedResources, resources: i18n.loadedResources,
@ -562,8 +563,8 @@ export class WindowHandler {
this.mainWebContents.send('welcome', { this.mainWebContents.send('welcome', {
url: podUrl, url: podUrl,
message: '', message: '',
urlValid: !!userConfigUrl, urlValid: !!podUrl,
isPodConfigured: this.isPodConfigured && !!userConfigUrl, isPodConfigured: this.isPodConfigured && !!podUrl,
isBrowserLoginEnabled: this.config.enableBrowserLogin, isBrowserLoginEnabled: this.config.enableBrowserLogin,
browserLoginAutoConnect: this.config.browserLoginAutoConnect, browserLoginAutoConnect: this.config.browserLoginAutoConnect,
}); });