diff --git a/src/components/Header.vue b/src/components/Header.vue index ddaca178..cbe6e2fd 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -135,7 +135,7 @@ export default { title: 'Ercole Version', message: `

Server Version: ${this.version}

-

Web Version: 2.51.0

+

Web Version: 2.51.1

`, cancelButton: false, type: 'is-success', diff --git a/src/components/settings/AlertService.vue b/src/components/settings/AlertService.vue index 41ccdb1b..559fead0 100644 --- a/src/components/settings/AlertService.vue +++ b/src/components/settings/AlertService.vue @@ -304,7 +304,7 @@ :options="trueOrFalseOptions" customClass="is-justify-content-flex-start" customRadioClass="mr-5" - :customRadioDisable="!AlertService.Emailer.Enabled" + :customRadioDisable="AlertService.Emailer.Enabled === false" /> @@ -324,7 +324,7 @@ allow-new ellipsis :before-adding="beforeAdding" - :disabled="!AlertService.Emailer.Enabled" + :disabled="AlertService.Emailer.Enabled === false" > @@ -343,7 +343,7 @@ :options="trueOrFalseOptions" customClass="is-justify-content-flex-start" customRadioClass="mr-5" - :customRadioDisable="!AlertService.Emailer.Enabled" + :customRadioDisable="AlertService.Emailer.Enabled === false" /> @@ -363,7 +363,7 @@ allow-new ellipsis :before-adding="beforeAdding" - :disabled="!AlertService.Emailer.Enabled" + :disabled="AlertService.Emailer.Enabled === false" > @@ -382,7 +382,7 @@ :options="trueOrFalseOptions" customClass="is-justify-content-flex-start" customRadioClass="mr-5" - :customRadioDisable="!AlertService.Emailer.Enabled" + :customRadioDisable="AlertService.Emailer.Enabled === false" /> @@ -402,7 +402,7 @@ allow-new ellipsis :before-adding="beforeAdding" - :disabled="!AlertService.Emailer.Enabled" + :disabled="AlertService.Emailer.Enabled === false" > @@ -421,7 +421,7 @@ :options="trueOrFalseOptions" customClass="is-justify-content-flex-start" customRadioClass="mr-5" - :customRadioDisable="!AlertService.Emailer.Enabled" + :customRadioDisable="AlertService.Emailer.Enabled === false" /> @@ -441,7 +441,7 @@ allow-new ellipsis :before-adding="beforeAdding" - :disabled="!AlertService.Emailer.Enabled" + :disabled="AlertService.Emailer.Enabled === false" > @@ -463,7 +463,7 @@ :options="trueOrFalseOptions" customClass="is-justify-content-flex-start" customRadioClass="mr-5" - :customRadioDisable="!AlertService.Emailer.Enabled" + :customRadioDisable="AlertService.Emailer.Enabled === false" /> @@ -485,7 +485,7 @@ allow-new ellipsis :before-adding="beforeAdding" - :disabled="!AlertService.Emailer.Enabled" + :disabled="AlertService.Emailer.Enabled === false" > @@ -504,7 +504,7 @@ :options="trueOrFalseOptions" customClass="is-justify-content-flex-start" customRadioClass="mr-5" - :customRadioDisable="!AlertService.Emailer.Enabled" + :customRadioDisable="AlertService.Emailer.Enabled === false" /> @@ -524,7 +524,7 @@ allow-new ellipsis :before-adding="beforeAdding" - :disabled="!AlertService.Emailer.Enabled" + :disabled="AlertService.Emailer.Enabled === false" > @@ -545,7 +545,7 @@ :options="trueOrFalseOptions" customClass="is-justify-content-flex-start" customRadioClass="mr-5" - :customRadioDisable="!AlertService.Emailer.Enabled" + :customRadioDisable="AlertService.Emailer.Enabled === false" /> @@ -567,7 +567,7 @@ allow-new ellipsis :before-adding="beforeAdding" - :disabled="!AlertService.Emailer.Enabled" + :disabled="AlertService.Emailer.Enabled === false" > @@ -586,7 +586,7 @@ :options="trueOrFalseOptions" customClass="is-justify-content-flex-start" customRadioClass="mr-5" - :customRadioDisable="!AlertService.Emailer.Enabled" + :customRadioDisable="AlertService.Emailer.Enabled === false" /> @@ -606,7 +606,7 @@ allow-new ellipsis :before-adding="beforeAdding" - :disabled="!AlertService.Emailer.Enabled" + :disabled="AlertService.Emailer.Enabled === false" > @@ -625,7 +625,7 @@ :options="trueOrFalseOptions" customClass="is-justify-content-flex-start" customRadioClass="mr-5" - :customRadioDisable="!AlertService.Emailer.Enabled" + :customRadioDisable="AlertService.Emailer.Enabled === false" /> @@ -645,7 +645,7 @@ allow-new ellipsis :before-adding="beforeAdding" - :disabled="!AlertService.Emailer.Enabled" + :disabled="AlertService.Emailer.Enabled === false" > @@ -664,7 +664,7 @@ :options="trueOrFalseOptions" customClass="is-justify-content-flex-start" customRadioClass="mr-5" - :customRadioDisable="!AlertService.Emailer.Enabled" + :customRadioDisable="AlertService.Emailer.Enabled === false" /> @@ -684,7 +684,7 @@ allow-new ellipsis :before-adding="beforeAdding" - :disabled="!AlertService.Emailer.Enabled" + :disabled="AlertService.Emailer.Enabled === false" > @@ -850,13 +850,26 @@ export default { emailerEnabled() { return this.AlertService.Emailer.Enabled }, + reportRunStartup() { + return this.AlertService.ReportAlertJob.RunAtStartup + }, }, watch: { + reportRunStartup(value) { + if (value) { + this.AlertService.Emailer.Enabled = null + } + }, emailerEnabled(value) { if (value !== null) { this.AlertService.ReportAlertJob.Crontab = null this.AlertService.ReportAlertJob.RunAtStartup = false } + + if (value === null) { + this.AlertService.ReportAlertJob.Crontab = '@daily' + this.AlertService.ReportAlertJob.RunAtStartup = true + } }, }, }