Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-01 21:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui: no mutations, less hacky

Browse Source
This commit is contained in:
Aaron Greenspan
2021-01-20 23:21:24 -07:00
committed by Aiden McClelland
parent 55179e3ead
commit d3dbdebbcf
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/app/modals/os-welcome/os-welcome.page.ts
View File

@@ -28,6 +28,8 @@ export class OSWelcomePage {
.then(() => this.apiService.acknowledgeOSWelcome(this.config.version)) .then(() => this.apiService.acknowledgeOSWelcome(this.config.version))
.catch(console.error) .catch(console.error)
return this.modalCtrl.dismiss({ autoCheckUpdates: this.autoCheckUpdates }) // return false to skip subsequent alert modals
// return true to show subsequent alert modals
return this.modalCtrl.dismiss(this.autoCheckUpdates)
} }
} }

5
ui/src/app/services/startup-alerts.notifier.ts
View File

@@ -39,7 +39,7 @@ export class StartupAlertsNotifier {
c.hasRun = true c.hasRun = true
if (!checkRes) return if (!checkRes) return
const displayRes = await previousDisplay const displayRes = await previousDisplay
if (c.shouldRun(server) && !!displayRes) return c.display(checkRes) if (displayRes) return c.display(checkRes)
}, Promise.resolve(true)) }, Promise.resolve(true))
} }
@@ -103,8 +103,7 @@ export class StartupAlertsNotifier {
await modal.present() await modal.present()
modal.onWillDismiss().then(res => { modal.onWillDismiss().then(res => {
s = Object.assign(s, res.data) return resolve(res.data)
return resolve(true)
}) })
}) })
} }