Skip to content

Commit bf4a8b6

Browse files
rcmaiolinircmaiolini
committed
Change ercole version
1 parent 4abaed9 commit bf4a8b6

File tree

2 files changed

+34
-21
lines changed

2 files changed

+34
-21
lines changed

‎src/components/Header.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ export default {
135135
title: 'Ercole Version',
136136
message: `
137137
<p class="has-text-weight-bold">Server Version: <span class="has-text-weight-normal">${this.version}</span></p>
138-
<p class="has-text-weight-bold">Web Version: <span class="has-text-weight-normal">2.51.0</span></p>
138+
<p class="has-text-weight-bold">Web Version: <span class="has-text-weight-normal">2.51.2</span></p>
139139
`,
140140
cancelButton: false,
141141
type: 'is-success',

‎src/components/settings/AlertService.vue‎

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@
304304
:options="trueOrFalseOptions"
305305
customClass="is-justify-content-flex-start"
306306
customRadioClass="mr-5"
307-
:customRadioDisable="!AlertService.Emailer.Enabled"
307+
:customRadioDisable="AlertService.Emailer.Enabled === false"
308308
/>
309309
</div>
310310
</div>
@@ -324,7 +324,7 @@
324324
allow-new
325325
ellipsis
326326
:before-adding="beforeAdding"
327-
:disabled="!AlertService.Emailer.Enabled"
327+
:disabled="AlertService.Emailer.Enabled === false"
328328
>
329329
</b-taginput>
330330
</div>
@@ -343,7 +343,7 @@
343343
:options="trueOrFalseOptions"
344344
customClass="is-justify-content-flex-start"
345345
customRadioClass="mr-5"
346-
:customRadioDisable="!AlertService.Emailer.Enabled"
346+
:customRadioDisable="AlertService.Emailer.Enabled === false"
347347
/>
348348
</div>
349349
</div>
@@ -363,7 +363,7 @@
363363
allow-new
364364
ellipsis
365365
:before-adding="beforeAdding"
366-
:disabled="!AlertService.Emailer.Enabled"
366+
:disabled="AlertService.Emailer.Enabled === false"
367367
>
368368
</b-taginput>
369369
</div>
@@ -382,7 +382,7 @@
382382
:options="trueOrFalseOptions"
383383
customClass="is-justify-content-flex-start"
384384
customRadioClass="mr-5"
385-
:customRadioDisable="!AlertService.Emailer.Enabled"
385+
:customRadioDisable="AlertService.Emailer.Enabled === false"
386386
/>
387387
</div>
388388
</div>
@@ -402,7 +402,7 @@
402402
allow-new
403403
ellipsis
404404
:before-adding="beforeAdding"
405-
:disabled="!AlertService.Emailer.Enabled"
405+
:disabled="AlertService.Emailer.Enabled === false"
406406
>
407407
</b-taginput>
408408
</div>
@@ -421,7 +421,7 @@
421421
:options="trueOrFalseOptions"
422422
customClass="is-justify-content-flex-start"
423423
customRadioClass="mr-5"
424-
:customRadioDisable="!AlertService.Emailer.Enabled"
424+
:customRadioDisable="AlertService.Emailer.Enabled === false"
425425
/>
426426
</div>
427427
</div>
@@ -441,7 +441,7 @@
441441
allow-new
442442
ellipsis
443443
:before-adding="beforeAdding"
444-
:disabled="!AlertService.Emailer.Enabled"
444+
:disabled="AlertService.Emailer.Enabled === false"
445445
>
446446
</b-taginput>
447447
</div>
@@ -463,7 +463,7 @@
463463
:options="trueOrFalseOptions"
464464
customClass="is-justify-content-flex-start"
465465
customRadioClass="mr-5"
466-
:customRadioDisable="!AlertService.Emailer.Enabled"
466+
:customRadioDisable="AlertService.Emailer.Enabled === false"
467467
/>
468468
</div>
469469
</div>
@@ -485,7 +485,7 @@
485485
allow-new
486486
ellipsis
487487
:before-adding="beforeAdding"
488-
:disabled="!AlertService.Emailer.Enabled"
488+
:disabled="AlertService.Emailer.Enabled === false"
489489
>
490490
</b-taginput>
491491
</div>
@@ -504,7 +504,7 @@
504504
:options="trueOrFalseOptions"
505505
customClass="is-justify-content-flex-start"
506506
customRadioClass="mr-5"
507-
:customRadioDisable="!AlertService.Emailer.Enabled"
507+
:customRadioDisable="AlertService.Emailer.Enabled === false"
508508
/>
509509
</div>
510510
</div>
@@ -524,7 +524,7 @@
524524
allow-new
525525
ellipsis
526526
:before-adding="beforeAdding"
527-
:disabled="!AlertService.Emailer.Enabled"
527+
:disabled="AlertService.Emailer.Enabled === false"
528528
>
529529
</b-taginput>
530530
</div>
@@ -545,7 +545,7 @@
545545
:options="trueOrFalseOptions"
546546
customClass="is-justify-content-flex-start"
547547
customRadioClass="mr-5"
548-
:customRadioDisable="!AlertService.Emailer.Enabled"
548+
:customRadioDisable="AlertService.Emailer.Enabled === false"
549549
/>
550550
</div>
551551
</div>
@@ -567,7 +567,7 @@
567567
allow-new
568568
ellipsis
569569
:before-adding="beforeAdding"
570-
:disabled="!AlertService.Emailer.Enabled"
570+
:disabled="AlertService.Emailer.Enabled === false"
571571
>
572572
</b-taginput>
573573
</div>
@@ -586,7 +586,7 @@
586586
:options="trueOrFalseOptions"
587587
customClass="is-justify-content-flex-start"
588588
customRadioClass="mr-5"
589-
:customRadioDisable="!AlertService.Emailer.Enabled"
589+
:customRadioDisable="AlertService.Emailer.Enabled === false"
590590
/>
591591
</div>
592592
</div>
@@ -606,7 +606,7 @@
606606
allow-new
607607
ellipsis
608608
:before-adding="beforeAdding"
609-
:disabled="!AlertService.Emailer.Enabled"
609+
:disabled="AlertService.Emailer.Enabled === false"
610610
>
611611
</b-taginput>
612612
</div>
@@ -625,7 +625,7 @@
625625
:options="trueOrFalseOptions"
626626
customClass="is-justify-content-flex-start"
627627
customRadioClass="mr-5"
628-
:customRadioDisable="!AlertService.Emailer.Enabled"
628+
:customRadioDisable="AlertService.Emailer.Enabled === false"
629629
/>
630630
</div>
631631
</div>
@@ -645,7 +645,7 @@
645645
allow-new
646646
ellipsis
647647
:before-adding="beforeAdding"
648-
:disabled="!AlertService.Emailer.Enabled"
648+
:disabled="AlertService.Emailer.Enabled === false"
649649
>
650650
</b-taginput>
651651
</div>
@@ -664,7 +664,7 @@
664664
:options="trueOrFalseOptions"
665665
customClass="is-justify-content-flex-start"
666666
customRadioClass="mr-5"
667-
:customRadioDisable="!AlertService.Emailer.Enabled"
667+
:customRadioDisable="AlertService.Emailer.Enabled === false"
668668
/>
669669
</div>
670670
</div>
@@ -684,7 +684,7 @@
684684
allow-new
685685
ellipsis
686686
:before-adding="beforeAdding"
687-
:disabled="!AlertService.Emailer.Enabled"
687+
:disabled="AlertService.Emailer.Enabled === false"
688688
>
689689
</b-taginput>
690690
</div>
@@ -850,13 +850,26 @@ export default {
850850
emailerEnabled() {
851851
return this.AlertService.Emailer.Enabled
852852
},
853+
reportRunStartup() {
854+
return this.AlertService.ReportAlertJob.RunAtStartup
855+
},
853856
},
854857
watch: {
858+
reportRunStartup(value) {
859+
if (value) {
860+
this.AlertService.Emailer.Enabled = null
861+
}
862+
},
855863
emailerEnabled(value) {
856864
if (value !== null) {
857865
this.AlertService.ReportAlertJob.Crontab = null
858866
this.AlertService.ReportAlertJob.RunAtStartup = false
859867
}
868+
869+
if (value === null) {
870+
this.AlertService.ReportAlertJob.Crontab = '@daily'
871+
this.AlertService.ReportAlertJob.RunAtStartup = true
872+
}
860873
},
861874
},
862875
}

0 commit comments

Comments
 (0)