Optimize "Customer has a referring customer" condition, RT#74452

[freeside.git] / httemplate / misc / process / link.cgi

diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
index df15dca..a3f9f3e 100755 (executable)
--- a/httemplate/misc/process/link.cgi
+++ b/httemplate/misc/process/link.cgi
@@ -1,14 +1,20 @@
 %unless ($error) {
 %  #no errors, so let's view this customer.
 %  my $custnum = $new->cust_pkg->custnum;
-<% $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#cust_pkg$pkgnum" ) %>
+%  my $show = $curuser->default_customer_view =~ /^(jumbo|packages)$/
+%               ? ''
+%               : ';show=packages';
+%  my $frag = "cust_pkg$pkgnum"; #hack for IE ignoring real #fragment
+<% $cgi->redirect(popurl(3). "view/cust_main.cgi?custnum=$custnum$show;fragment=$frag#$frag" ) %>
 %} else {
 % errorpage($error);
 %}
 <%init>
 
+my $curuser = $FS::CurrentUser::CurrentUser;
+
 die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('View/link unlinked services');
+  unless $curuser->access_right('View/link unlinked services');
 
 my $DEBUG = 0;
 
@@ -24,7 +30,7 @@ unless ( $svcnum ) {
   my $svcdb = $part_svc->getfield('svcdb');
   $cgi->param('link_field') =~ /^(\w+)$/;
   my $link_field = $1;
-  my %search = ( $link_field => $cgi->param('link_value') );
+  my %search = ( $link_field => scalar($cgi->param('link_value')) );
   if ( $cgi->param('link_field2') =~ /^(\w+)$/ ) {
     $search{$1} = $cgi->param('link_value2');
   }