v4 style

[freeside.git] / httemplate / elements / tr-select-cust_tag.html

diff --git a/httemplate/elements/tr-select-cust_tag.html b/httemplate/elements/tr-select-cust_tag.html
index d88f3a8..711408e 100644 (file)
--- a/httemplate/elements/tr-select-cust_tag.html
+++ b/httemplate/elements/tr-select-cust_tag.html
@@ -1,11 +1,9 @@
-% if ( $curuser->access_right('Edit customer tags') && @part_tag ) {
+% if ( ($curuser->access_right('Edit customer tags') && @part_tag) || $is_report ) {
 
   <TR>
-    <TD ALIGN="right"><% $opt{'label'} || 'Tags' %></TD>
+    <TH ALIGN="right"><% $opt{'label'} || 'Tags' %></TD>
     <TD>
       <% include( '/elements/select-cust_tag.html',
-                     'curr_value' => \@curr_tagnum,
-                     'part_tag'   => \@part_tag,
                      %opt,
                  )
       %>
@@ -25,9 +23,10 @@ my $curuser = $FS::CurrentUser::CurrentUser;
 
 my %opt = @_;
 my $cgi = $opt{'cgi'};
+my $is_report = $opt{'is_report'};
 
 my @curr_tagnum = ();
-if ( $cgi->param('error') ) {
+if ( $cgi && $cgi->param('tagnum') ) {
   @curr_tagnum = $cgi->param('tagnum');
 } elsif ( $opt{'custnum'} ) {
   @curr_tagnum = map $_->tagnum,
@@ -37,6 +36,8 @@ if ( $cgi->param('error') ) {
 my $extra_sql = "WHERE disabled IS NULL OR disabled = '' ";
 $extra_sql .= ' OR tagnum IN ('. join(',', @curr_tagnum). ')' if @curr_tagnum;
 
+#now kind of inefficient (we only want to know if there are any), but since
+# its an edit control its not significant
 my @part_tag = qsearch({
   'table'     => 'part_tag',
   'hashref'   => {},