Merge branch 'ent-9157-13709-bug-programacion-plantilla-de-alertas' into 'develop'
Ent 9157 13709 bug programacion plantilla de alertas #9157 https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9157 See merge request artica/pandorafms!5010
This commit is contained in:
commit
3a7ba1ecb4
|
@ -573,7 +573,7 @@ sub pandora_evaluate_alert ($$$$$$$;$$$$) {
|
|||
if ($timeBlock->{'start'} eq $timeBlock->{'end'}) {
|
||||
# All day.
|
||||
$inSlot = 1;
|
||||
} elsif ($timeBlock->{'start'} le $time && $timeBlock->{'end'} ge $time) {
|
||||
} elsif ($timeBlock->{'start'} le $time && (($timeBlock->{'end'} eq '00:00:00') || ($timeBlock->{'end'} ge $time))) {
|
||||
# In range.
|
||||
$inSlot = 1;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue