diff options
| -rw-r--r-- | httemplate/search/elements/cust_main_dayranges.html | 2 | ||||
| -rw-r--r-- | httemplate/search/elements/search.html | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/httemplate/search/elements/cust_main_dayranges.html b/httemplate/search/elements/cust_main_dayranges.html index e5b1f478c..076565396 100644 --- a/httemplate/search/elements/cust_main_dayranges.html +++ b/httemplate/search/elements/cust_main_dayranges.html @@ -271,7 +271,7 @@ if (delete($opt{'email_checkboxes'})) { qq!<input type="checkbox" name="custnum" value="$custnum">!; }; $act_align = 'l'; - push @act_blank, ''; + push @act_blank, {nodownload => 1}; } </%init> diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html index f136832a2..beb017300 100644 --- a/httemplate/search/elements/search.html +++ b/httemplate/search/elements/search.html @@ -222,6 +222,18 @@ if ( !$curuser->access_right('Download report data') ) { $type = 'html'; } +# split/map aligns here before doing anything else +my %align = ( + 'l' => 'left', + 'r' => 'right', + 'c' => 'center', + ' ' => '', + '.' => '', +); + +$opt{align} = [ map $align{$_}, split(//, $opt{align}) ], + unless !$opt{align} || ref($opt{align}); + if($type =~ /csv|xls/) { my $h = $opt{'header'}; my @del; @@ -245,18 +257,6 @@ $opt{disable_download} = 0 $opt{disable_download} = 1 if $opt{really_disable_download}; -# split/map aligns here, so that agent_virt can add a column -# (search-html.html will split aligns also if they aren't already split) -my %align = ( - 'l' => 'left', - 'r' => 'right', - 'c' => 'center', - ' ' => '', - '.' => '', -); -$opt{align} = [ map $align{$_}, split(//, $opt{align}) ], - unless !$opt{align} || ref($opt{align}); - # get our queries ready my $query = $opt{query} or die "query required"; my $count_query = $opt{count_query} or die "count_query required"; |