diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2018-07-16 21:57:52 -0400 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2018-07-16 21:57:52 -0400 |
| commit | e6e941b0f73452f6207bb74bdda244630cda9e1e (patch) | |
| tree | d119139f5b88ff326dd3e20f7506eb2c540b7ed2 | |
| parent | 98d491d009d8bc9000d6272aedaa0c315d0d9ffc (diff) | |
| parent | ee32c5f35c41c7bc30a26b3217db3196ff5f39b7 (diff) | |
Merge branch 'FREESIDE_4_BRANCH' of ssh://git.freeside.biz/home/git/freeside into FREESIDE_4_BRANCH
| -rw-r--r-- | FS/FS/svc_IP_Mixin.pm | 2 | ||||
| -rwxr-xr-x | FS/FS/svc_broadband.pm | 12 | ||||
| -rwxr-xr-x | rt/lib/RT/Record.pm | 5 |
3 files changed, 12 insertions, 7 deletions
diff --git a/FS/FS/svc_IP_Mixin.pm b/FS/FS/svc_IP_Mixin.pm index 8b2b5f17e..4b402fa8d 100644 --- a/FS/FS/svc_IP_Mixin.pm +++ b/FS/FS/svc_IP_Mixin.pm @@ -80,7 +80,7 @@ sub svc_ip_check { my $error = $self->ip_check; return $error if $error; if ( my $router = $self->router ) { - if ( grep { $_->routernum eq $router->routernum } $self->allowed_routers ) { + if ( grep { $_->routernum == $router->routernum } $self->allowed_routers ) { return ''; } else { return 'Router '.$router->routername.' not available for this service'; diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm index 96028df9c..b2fc27260 100755 --- a/FS/FS/svc_broadband.pm +++ b/FS/FS/svc_broadband.pm @@ -110,12 +110,12 @@ sub table_info { 'speed_down' => 'Download speed (Kbps)', 'speed_up' => 'Upload speed (Kbps)', 'ip_addr' => 'IP address', - 'blocknum' => - { 'label' => 'Address block', - 'type' => 'select', - 'select_table' => 'addr_block', - 'select_key' => 'blocknum', - 'select_label' => 'cidr', + 'blocknum' => { + 'label' => 'Address block', + 'type' => 'select', + 'select_table' => 'addr_block', + 'select_key' => 'blocknum', + 'select_label' => 'cidr', 'disable_inventory' => 1, }, 'plan_id' => 'Service Plan Id', diff --git a/rt/lib/RT/Record.pm b/rt/lib/RT/Record.pm index 1818c2d48..8f1b5be5e 100755 --- a/rt/lib/RT/Record.pm +++ b/rt/lib/RT/Record.pm @@ -1282,6 +1282,11 @@ sub Customers { $self->{'Customers'} = $self->MemberOf->Clone; + $self->{'Customers'}->Limit( FIELD => 'Base', + OPERATOR => 'STARTSWITH', + VALUE => 'fsck.com-rt://%/ticket/', + ); + for my $fstable (qw(cust_main cust_svc)) { $self->{'Customers'}->Limit( |