MT#57240 Allow '+' char in device line number definition

Change-Id: I0234d7fd3a34d55cd1370a65f93171264eb7f44f
(cherry picked from commit b013f3560a)
mr11.2.1
Marco Capetta 2 years ago
parent 465de23921
commit 4fd28056c3

@ -217,8 +217,8 @@ sub update_item {
$line->{line_type} = delete $line->{type};
if (defined $line->{target_number} && $line->{target_number} !~ /^[0-9#*]+$/) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid 'target_number' ($line->{target_number}), can contain only '0-9' numbers and '#','*' characters");
if (defined $line->{target_number} && $line->{target_number} !~ /^[0-9#*+]+$/) {
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Invalid 'target_number' ($line->{target_number}), can contain only '0-9' numbers and '+','#','*' characters");
return;
}

@ -1107,7 +1107,7 @@ function create_ranges_annotations(id,type,ranges){
'<input type="checkbox" class="switch" ' + isSwitchOn + ' name="line.' + linecmt + '.switch" id="line.' + linecmt + '">' +
'<span class="slider round"></span>' +
'</label>' +
'<input type="text" class="subinput" oninput="this.value = this.value.replace(/[^0-9#*]/, \'\')" name="line.' + linecmt + '.target_number" id="line.' + linecmt + '.target_number" ' + targetNumber + '>' +
'<input type="text" class="subinput" oninput="this.value = this.value.replace(/[^0-9#*+]/, \'\')" name="line.' + linecmt + '.target_number" id="line.' + linecmt + '.target_number" ' + targetNumber + '>' +
'<select class="subselect" name="line.' + linecmt + '.subscriber_id" id="line.' + linecmt + '.subscriber_id">' +
'<option value="0">'+(linekeyCurrent ? '[% c.loc("Subscriber") %]' : '[% c.loc("None") %]' )+'</option>' +
[% FOR sub IN subscribers.all -%]

Loading…
Cancel
Save