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

2 files changed, 13 insertions, 0 deletions

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
+                   ];
+
+
 }
 
 </%init>
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 1c55c14f4..f9ad5797b 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -586,6 +586,7 @@ $config_misc{'Hardware types'} = [ $fsurl.'browse/hardware_class.html', 'Set up
 if ( $curuser->access_right('Configuration') ) {
   $config_misc{'RADIUS Groups'} = [ $fsurl.'browse/radius_group.html', 'Manage RADIUS groups' ];
   $config_misc{'RADIUS Clients'} = [ $fsurl.'browse/nas.html', 'Manage RADIUS clients' ];
+  $config_misc{'Cable modem models'} = [ $fsurl.'browse/cable_model.html', '' ];
 }
 
 tie my %config_menu, 'Tie::IxHash';