[freeside-commits] freeside/httemplate/search cust_pkg.cgi, 1.59.2.4, 1.59.2.5

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv6649/search

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	cust_pkg.cgi 
Log Message:
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

Index: cust_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pkg.cgi,v
retrieving revision 1.59.2.4
retrieving revision 1.59.2.5
diff -u -w -d -r1.59.2.4 -r1.59.2.5
--- cust_pkg.cgi	25 Feb 2010 05:49:38 -0000	1.59.2.4
+++ cust_pkg.cgi	2 Mar 2010 17:18:32 -0000	1.59.2.5
@@ -143,7 +143,6 @@
                     ),
                     '',
                   ],
-                  'extra_choices_callback'=> $extra_choices, 
               )
 %>
 <%init>
@@ -253,30 +252,29 @@
    };
 }
 
-my $html_init = include('/elements/init_overlib.html');
-
-my $extra_choices = sub {
+my $html_init = sub {
   my $query = shift;
   my $text = '';
+  my $curuser = $FS::CurrentUser::CurrentUser;
 
-  if( $FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages') ) {
-    $text .= '<BR><BR>'.
+  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,
-            );
-    if( $FS::CurrentUser::CurrentUser->access_right('Edit customer package dates') ) {
-      $text .= '<BR>'.
-              include( '/elements/popup_link.html',
+             ). '<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;