projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix date parsing when using international dates (package date edit), RT#8027
[freeside.git]
/
httemplate
/
edit
/
svc_broadband.cgi
diff --git
a/httemplate/edit/svc_broadband.cgi
b/httemplate/edit/svc_broadband.cgi
index
01e58cd
..
b11fec7
100644
(file)
--- a/
httemplate/edit/svc_broadband.cgi
+++ b/
httemplate/edit/svc_broadband.cgi
@@
-2,7
+2,7
@@
'post_url' => popurl(1). 'process/svc_broadband.cgi',
'name' => 'broadband service',
'table' => 'svc_broadband',
'post_url' => popurl(1). 'process/svc_broadband.cgi',
'name' => 'broadband service',
'table' => 'svc_broadband',
- 'labels' => { 'svcnum' => 'Service
#
',
+ 'labels' => { 'svcnum' => 'Service',
'description' => 'Description',
'ip_addr' => 'IP address',
'speed_down' => 'Download speed',
'description' => 'Description',
'ip_addr' => 'IP address',
'speed_down' => 'Download speed',
@@
-63,12
+63,12
@@
my $callback = sub {
if $fieldref->{field} eq 'blocknum';
$fieldref->{value} = $object->addr_block->label
if $fieldref->{field} eq 'blocknum';
$fieldref->{value} = $object->addr_block->label
- if $fieldref->{field} eq 'block_label';
+ if $fieldref->{field} eq 'block_label'
&& $object->addr_block
;
} else {
if ($fieldref->{field} eq 'block_label') {
} else {
if ($fieldref->{field} eq 'block_label') {
- if ($fixedblock) {
+ if ($fixedblock
&& $object->addr_block
) {
$object->blocknum($fixedblock);
$fieldref->{value} = $object->addr_block->label;
}else{
$object->blocknum($fixedblock);
$fieldref->{value} = $object->addr_block->label;
}else{
@@
-93,7
+93,8
@@
my $callback = sub {
&& $FS::CurrentUser::CurrentUser->agentnum($_->agentnum)
}
map { $_->addr_block } $object->allowed_routers;
&& $FS::CurrentUser::CurrentUser->agentnum($_->agentnum)
}
map { $_->addr_block } $object->allowed_routers;
- my @options = map { $_->blocknum } @addr_block;
+ my @options = map { $_->blocknum }
+ sort { $a->label cmp $b->label } @addr_block;
my %option_labels = map { ( $_->blocknum => $_->label ) } @addr_block;
$fieldref->{type} = 'select';
$fieldref->{options} = \@options;
my %option_labels = map { ( $_->blocknum => $_->label ) } @addr_block;
$fieldref->{type} = 'select';
$fieldref->{options} = \@options;