[freeside-commits] freeside/httemplate/elements header.html, 1.13.2.11, 1.13.2.12

Sun Apr 19 17:20:32 PDT 2009

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

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	header.html 
Log Message:
fix botched backport from 1.9

Index: header.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/header.html,v
retrieving revision 1.13.2.11
retrieving revision 1.13.2.12
diff -u -d -r1.13.2.11 -r1.13.2.12

--- header.html	17 Apr 2009 07:03:03 -0000	1.13.2.11
+++ header.html	20 Apr 2009 00:20:29 -0000	1.13.2.12
@@ -165,7 +165,7 @@
         </TD>
 
         <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
-% if ( $FS::CurrentUser::CurrentUser->access_right('List customers') ) {
+% if ( $curuser->access_right('List customers') ) {
           <FORM ACTION="<%$fsurl%>search/cust_main.cgi" METHOD="GET" STYLE="margin:0">
             <INPUT NAME="search_cust" TYPE="text" VALUE="(cust #, name, company or phone)" SIZE="28" onFocus="clearhint_search_cust(this);" onClick="clearhint_search_cust(this);" STYLE="vertical-align:bottom;text-align:right"><BR>
             <A HREF="<%$fsurl%>search/report_cust_main.html" STYLE="color: #ffffff; font-size: 70%">Advanced</A>
@@ -186,11 +186,11 @@
         </TD>
 
         <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
-% if ( $FS::CurrentUser::CurrentUser->access_right('View invoices') ) { 
+% if ( $curuser->access_right('View invoices') ) { 
 
             <FORM ACTION="<%$fsurl%>search/cust_bill.html" METHOD="GET" STYLE="margin:0;display:inline">
               <INPUT NAME="invnum" TYPE="text" VALUE="(inv #)" SIZE="4" onFocus="clearhint_search_invoice(this);" onClick="clearhint_search_invoice(this);" STYLE="vertical-align:bottom;text-align:right;margin-bottom:1px">
-%   if ( $FS::CurrentUser::CurrentUser->access_right('List invoices') ) { 
+%   if ( $curuser->access_right('List invoices') ) { 
 
                 <A HREF="<%$fsurl%>search/report_cust_bill.html" STYLE="color: #ffffff; font-size: 70%">Advanced</A>
 %   } 
@@ -268,8 +268,11 @@
 my($title, $menubar) = ( shift, shift );
 my $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc.
 my $head = @_ ? shift : ''; #$head is for things that go in the <HEAD> section
+
 my $conf = new FS::Conf;
 
+my $curuser = $FS::CurrentUser::CurrentUser;
+
 my $menu_position = $FS::CurrentUser::CurrentUser->option('menu_position')
                     || 'left';
 

