diff options
author | jeff <jeff> | 2010-05-22 19:57:53 +0000 |
---|---|---|
committer | jeff <jeff> | 2010-05-22 19:57:53 +0000 |
commit | 4ef5b3b917b7802a136551ad567dc9d649700f53 (patch) | |
tree | 2d55887d28f88922e5a61eeb802bb1a0fe627437 /httemplate/search/elements/search.html | |
parent | 6c08340010e68fa7ca0989f4902761c8d0db941f (diff) |
improved fcc 477 report #7783
Diffstat (limited to 'httemplate/search/elements/search.html')
-rw-r--r-- | httemplate/search/elements/search.html | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html index 636885edc..a258f1721 100644 --- a/httemplate/search/elements/search.html +++ b/httemplate/search/elements/search.html @@ -172,6 +172,10 @@ Example: % <% include('search-xls.html', header=>$header, rows=>$rows, opt=>\%opt ) %> % +% } elsif ( $type eq 'xml' ) { +% +<% include('search-xml.html', rows=>$rows, opt=>\%opt ) %> +% % } else { # regular HTML % <% include('search-html.html', @@ -195,7 +199,7 @@ my(%opt) = @_; my $curuser = $FS::CurrentUser::CurrentUser; -my $type = $cgi->param('_type') =~ /^(csv|\w*\.xls|select|html(-print)?)$/ +my $type = $cgi->param('_type') =~ /^(csv|\w*\.xls|xml|select|html(-print)?)$/ ? $1 : 'html' ; my %align = ( @@ -224,9 +228,13 @@ if($type =~ /csv|xls/) { } while ( exists($h->[$i]) ); } +# wtf? $opt{disable_download} = 0 if $opt{disable_download} && $curuser->access_right('Configuration download'); +$opt{disable_download} = 1 + if $opt{really_disable_download}; + my @link_agentnums = (); my $null_link = ''; if ( $opt{'agent_virt'} ) { |