From 28e563e2e930d0bfd54909c886a76294bf672bfd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 2 Mar 2010 17:18:32 +0000
Subject: [PATCH] UI: get rid of undocumented extra_choices_callback in
 search.html: a terrible place to put action links from a UI perspective, move
 package links to html_init, now consitent with customer links, change label
 on popup from "increment bill date" to "increment next bill date", RT#7132

---
 httemplate/misc/bulk_pkg_increment_bill.cgi |  4 +--
 httemplate/search/cust_pkg.cgi              | 44 ++++++++++++++---------------
 httemplate/search/elements/search-html.html |  5 ----
 3 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/httemplate/misc/bulk_pkg_increment_bill.cgi b/httemplate/misc/bulk_pkg_increment_bill.cgi
index 79bc0cd3e..d594b558a 100755
--- a/httemplate/misc/bulk_pkg_increment_bill.cgi
+++ b/httemplate/misc/bulk_pkg_increment_bill.cgi
@@ -1,4 +1,4 @@
-<% include('/elements/header-popup.html', "Increment Bill Date") %>
+<% include('/elements/header-popup.html', "Increment Next Bill Date") %>
 
 % if ( $cgi->param('error') ) {
   <FONT SIZE="+1" COLOR="#ff0000">Error: <% $cgi->param('error') %></FONT>
@@ -36,7 +36,7 @@
 </TABLE>
 
 <BR>
-<INPUT TYPE="submit" VALUE="Increment bill date">
+<INPUT TYPE="submit" VALUE="Increment next bill date">
 
 </FORM>
 </BODY>
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 2a4366ae4..83cd206cb 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -143,7 +143,6 @@
                     ),
                     '',
                   ],
-                  'extra_choices_callback'=> $extra_choices, 
               )
 %>
 <%init>
@@ -253,30 +252,29 @@ sub time_or_blank {
    };
 }
 
-my $html_init = include('/elements/init_overlib.html');
-
-my $extra_choices = sub {
+my $html_init = sub {
   my $query = shift;
   my $text = '';
-
-  if( $FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages') ) {
-    $text .= '<BR><BR>'.
-            include( '/elements/popup_link.html',
-              'label'       => 'Change these packages',
-              'action'      => "${p}misc/bulk_change_pkg.cgi?$query",
-              'actionlabel' => 'Change Packages',
-              'width'       => 569,
-              'height'      => 210,
-            );
-    if( $FS::CurrentUser::CurrentUser->access_right('Edit customer package dates') ) {
-      $text .= '<BR>'.
-              include( '/elements/popup_link.html',
-                'label'       => 'Increment next bill date',
-                'action'      => "${p}misc/bulk_pkg_increment_bill.cgi?$query",
-                'actionlabel' => 'Increment Bill Date',
-                'width'       => 569,
-                'height'      => 210,
-                );
+  my $curuser = $FS::CurrentUser::CurrentUser;
+
+  if ( $curuser->access_right('Bulk change customer packages') ) {
+    $text .= include('/elements/init_overlib.html').
+             include( '/elements/popup_link.html',
+               'label'       => 'Change these packages',
+               'action'      => "${p}misc/bulk_change_pkg.cgi?$query",
+               'actionlabel' => 'Change Packages',
+               'width'       => 569,
+               'height'      => 210,
+             ). '<BR>';
+
+    if ( $curuser->access_right('Edit customer package dates') ) {
+      $text .= include( '/elements/popup_link.html',
+                 'label'       => 'Increment next bill date',
+                 'action'      => "${p}misc/bulk_pkg_increment_bill.cgi?$query",
+                 'actionlabel' => 'Increment Bill Date',
+                 'width'       => 569,
+                 'height'      => 210,
+              ). '<BR>';
     }
   }
   return $text;
diff --git a/httemplate/search/elements/search-html.html b/httemplate/search/elements/search-html.html
index 71e61de61..417565d46 100644
--- a/httemplate/search/elements/search-html.html
+++ b/httemplate/search/elements/search-html.html
@@ -144,11 +144,6 @@
 %               $cgi->param('_type', 'html-print'); 
                 as <A HREF="<% $cgi->self_url %>">printable copy</A>
 
-              <% $opt{'extra_choices_callback'}
-                 ? &{$opt{'extra_choices_callback'}}($cgi->query_string)
-                 : ''
-              %>
-
               </TD>
 %             $cgi->param('_type', "html" ); 
 %           } 
-- 
2.11.0