From b46a09ef4cce4ddbd404e6e6347baffde8170716 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Tue, 10 Sep 2013 01:33:32 -0700 Subject: svc_cable service have a single serial / MAC / model, not one-to-many devices like svc_phone and svc_dsl (2.3 backport), RT#22009 Conflicts: FS/FS/Mason.pm FS/FS/svc_broadband.pm FS/MANIFEST httemplate/edit/elements/part_svc_column.html httemplate/elements/menu.html --- httemplate/edit/svc_Common.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'httemplate/edit') diff --git a/httemplate/edit/svc_Common.html b/httemplate/edit/svc_Common.html index 3da72d2e8..5949a4dc0 100644 --- a/httemplate/edit/svc_Common.html +++ b/httemplate/edit/svc_Common.html @@ -20,6 +20,7 @@ if ( UNIVERSAL::can("FS::$table", 'table_info') ) { $opt{'name'} = "FS::$table"->table_info->{'name'}; my $fields = "FS::$table"->table_info->{'fields'}; + my %labels = map { $_ => ( ref($fields->{$_}) ? $fields->{$_}{'label'} : $fields->{$_} @@ -28,6 +29,17 @@ if ( UNIVERSAL::can("FS::$table", 'table_info') ) { keys %$fields; $opt{'labels'} = \%labels; + #transform FS::svc_* table_info's structure into one edit.html likes + delete $fields->{svcnum}; + $opt{'fields'} = [ map { ref $fields->{$_} + ? { field => $_, + %{ $fields->{$_} } + } + : $_ + } keys %$fields + ]; + + } -- cgit v1.2.1