From 324209d9ea24ca2f6a6f387088263933c06e39df Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Fri, 14 Aug 2015 16:32:21 -0700
Subject: [PATCH] fix links from package report to services that use
 view/svc_Common, #37621

---
 httemplate/search/cust_pkg.cgi | 9 ++++++---
 httemplate/view/cust_svc.cgi   | 8 +++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index c88b3a1d5..f1e686a83 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -310,11 +310,14 @@ my $process_svc_labels = sub {
       foreach ( map { [ $_->label ] } @{ $part_svc->cust_pkg_svc } ) {
         push @out, [ 
         { 'data' => $_->[0]. ':',
-          'align'=> 'right', },
+          'align'=> 'right',
+        },
+
         { 'data' => $_->[1],
           'align'=> 'left',
-          'link' => $p. 'view/' .
-          $_->[2]. '.cgi?'. $_->[3], },
+          'link' => $p. 'view/cust_svc.cgi?' . $_->[3],
+        },
+
         ];
       }
     }
diff --git a/httemplate/view/cust_svc.cgi b/httemplate/view/cust_svc.cgi
index 8ccfce3ff..aaf367882 100644
--- a/httemplate/view/cust_svc.cgi
+++ b/httemplate/view/cust_svc.cgi
@@ -1,4 +1,4 @@
-<% $cgi->redirect(popurl(1)."$svcdb.cgi?". $svcnum ) %>
+<% $cgi->redirect($url) %>
 <%init>
 
 #needed here?  we're just redirecting.  i guess it could reveal the svcdb of a
@@ -18,6 +18,12 @@ my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unknown svcpart" unless $part_svc;
 
 my $svcdb = $part_svc->svcdb;
+my $url = svc_url(
+            'm' => $m,
+            'action'  => 'view',
+            'svcdb'   => $svcdb,
+            'query'   => $svcnum,
+          );
 
 </%init>
 
-- 
2.11.0