From ffce52beccfa28c8d16f7fa0a82f11b34e847f5b Mon Sep 17 00:00:00 2001 From: Flaviu Mates Date: Tue, 5 Nov 2019 13:55:46 +0200 Subject: [PATCH] TT#69063 - Fix stuck timeset event list * Add validation for 'By week day number' field because if set incorrectly, JS would fail to parse it and the events list would get stuck Change-Id: Iac3ef0635e3728af9b900e68cc21ad0de60d0da9 --- lib/NGCP/Panel/Form/TimeSet/EventAdvanced.pm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/NGCP/Panel/Form/TimeSet/EventAdvanced.pm b/lib/NGCP/Panel/Form/TimeSet/EventAdvanced.pm index ace2b649a4..b5d65faea4 100644 --- a/lib/NGCP/Panel/Form/TimeSet/EventAdvanced.pm +++ b/lib/NGCP/Panel/Form/TimeSet/EventAdvanced.pm @@ -691,6 +691,18 @@ sub custom_set_values { return $fif; } +sub validate_byday { + my ($self, $field) = @_; + + if (my $weekdaynumber = $field->field('weekdaynumber')) { + unless ($weekdaynumber->value =~ /^([+-]?\d)(MO|TU|WE|TH|FR|SA|SO)$/) { + $weekdaynumber->add_error($weekdaynumber->label . ' should be like (\+|-)?\d*(MO|TU|WE|TH|FR|SA|SO) (e.g. 5FR)'); + return 0; + } + } + return 1; +} + 1; # vim: set tabstop=4 expandtab: