TT#23277 change lnp number type from enum to string

+ also prevent whitespace chars

Change-Id: Ib91f983c458066e7638f2360d7664b97b3c2e294
(cherry picked from commit e52dadda10)
changes/54/17154/2
Rene Krenn 8 years ago
parent d1e5f88714
commit d8b96c73aa

@ -41,18 +41,14 @@ has_field 'routing_number' => (
);
has_field 'type' => (
type => 'Select',
type => 'Text',
required => 0,
label => 'Type',
options => [
{ label => '', value => '' },
{ label => 'fixed', value => 'fixed' },
{ label => 'mobile', value => 'mobile' },
],
maxlength => 31,
element_attr => {
rel => ['tooltip'],
title => ['The optional LNP number type tag, for CDR exports.']
},
validate_method => \&_validate_type,
);
has_field 'start' => (
@ -101,5 +97,14 @@ sub validate_number {
return;
}
sub _validate_type {
my ( $self, $field ) = @_;
if ($field->input =~ /[^a-z0-9_-]/i) {
$field->add_error($field->label . " must be alphanumeric");
}
return;
}
1;
# vim: set tabstop=4 expandtab:

@ -132,7 +132,10 @@ sub upload_csv {
if($row->{end} && $row->{end} =~ /^\d{4}-\d{2}-\d{2}$/) {
$row->{end} .= 'T23:59:59';
}
$row->{type} ||= undef;
if (defined $row->{type} and (length($row->{type}) > 31 or $row->{type} =~ /[^a-z0-9_-]/i)) {
push @fails, $linenum;
next;
}
push @numbers, [$carriers{$k}, $row->{number}, $row->{routing_number}, $row->{start}, $row->{end}, $row->{type}];
if($linenum % $chunk_size == 0) {

Loading…
Cancel
Save