This commit was manufactured by cvs2svn to create tag 'freeside_2_1_0'.

[freeside.git] / httemplate / search / cust_pkg.cgi

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 74a3a6d..adbec7a 100755 (executable)
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -80,18 +80,6 @@
                     #      '</table>';
                     #    },
                     sub {
-                      my $cust_pkg = shift;
-                      my $type = $cgi->param('_type') || '';
-                      if ($type =~ /xls|csv/) {
-                        my $cust_svc = $cust_pkg->primary_cust_svc;
-                        if($cust_svc) {
-                          return join ": ",($cust_svc->label)[0,1];
-                        }
-                        else {
-                          return '';
-                        }
-                      }
-                      else {
                           [ map {
                                   [ 
                                     { 'data' => $_->[0]. ':',
@@ -103,10 +91,9 @@
                                                 $_->[2]. '.cgi?'. $_->[3],
                                     },
                                   ];
-                                } $cust_pkg->labels
+                                } shift->labels
                           ];
-                      }
-                    }
+                        },
                   ],
                   'color' => [
                     '',