MT#17473 allow single numbers in alias range field

by setting the length to 0 or undef

Change-Id: Ide65d6a0c6be635cdd51b569dd3f913fb52cf2bb
changes/14/4314/3
Gerhard Jungwirth 10 years ago
parent d8c903281c
commit 029765d8a5

@ -1,5 +1,4 @@
package NGCP::Panel::Field::E164;
use Moose;
use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound';

@ -1,5 +1,4 @@
package NGCP::Panel::Field::E164Range;
use Moose;
use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Compound';
@ -15,7 +14,6 @@ has_field 'cc' => (
},
do_label => 0,
do_wrapper => 0,
required => 1,
);
has_field 'ac' => (
@ -27,7 +25,6 @@ has_field 'ac' => (
},
do_label => 0,
do_wrapper => 0,
required => 0,
);
has_field 'snbase' => (
@ -39,7 +36,6 @@ has_field 'snbase' => (
},
do_label => 0,
do_wrapper => 0,
required => 1,
);
has_field 'snlength' => (
@ -51,7 +47,6 @@ has_field 'snlength' => (
},
do_label => 0,
do_wrapper => 0,
required => 1,
);
sub validate {

@ -1,5 +1,4 @@
package NGCP::Panel::Field::E164RangeRepeat;
use Moose;
use HTML::FormHandler::Moose;
extends 'HTML::FormHandler::Field::Repeatable';

@ -1,7 +1,7 @@
package NGCP::Panel::Field::PosInteger;
use Moose;
use HTML::FormHandler::Moose;
use Sipwise::Base;
use base 'HTML::FormHandler::Field::Integer';
extends 'HTML::FormHandler::Field::Integer';
sub validate {
my ( $self ) = @_;

@ -264,12 +264,20 @@ sub create_subscriber {
foreach my $range(@{ $params->{e164range} }) {
if(defined $range->{e164range}{cc} && $range->{e164range}{cc} ne '') {
my $len = $range->{e164range}{snlength};
foreach my $ext(0 .. int("9" x $len)) {
$range->{e164range}{sn} = sprintf("%s%0".$len."d", $range->{e164range}{snbase}, $ext);
if ($len) {
foreach my $ext(0 .. int("9" x $len)) {
$range->{e164range}{sn} = sprintf("%s%0".$len."d", $range->{e164range}{snbase}, $ext);
push @alias_numbers, { e164 => {
cc => $range->{e164range}{cc},
ac => $range->{e164range}{ac},
sn => $range->{e164range}{sn},
}};
}
} else {
push @alias_numbers, { e164 => {
cc => $range->{e164range}{cc},
ac => $range->{e164range}{ac},
sn => $range->{e164range}{sn},
sn => $range->{e164range}{snbase},
}};
}
}

Loading…
Cancel
Save