projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create branch
[freeside.git]
/
httemplate
/
search
/
elements
/
search.html
diff --git
a/httemplate/search/elements/search.html
b/httemplate/search/elements/search.html
index
0dc4170
..
2188169
100644
(file)
--- a/
httemplate/search/elements/search.html
+++ b/
httemplate/search/elements/search.html
@@
-121,6
+121,7
@@
Example:
#handling agent virtualization
'agent_virt' => 1, # set true if this search should be
# agent-virtualized
#handling agent virtualization
'agent_virt' => 1, # set true if this search should be
# agent-virtualized
+ 'agent_null' => 1, # set true to view global records always
'agent_null_right' => 'Access Right', # optional right to view global
# records
'agent_null_right_link' => 'Access Right' # optional right to link to
'agent_null_right' => 'Access Right', # optional right to view global
# records
'agent_null_right_link' => 'Access Right' # optional right to link to
@@
-171,6
+172,10
@@
Example:
%
<% include('search-xls.html', header=>$header, rows=>$rows, opt=>\%opt ) %>
%
%
<% 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',
% } else { # regular HTML
%
<% include('search-html.html',
@@
-194,7
+199,7
@@
my(%opt) = @_;
my $curuser = $FS::CurrentUser::CurrentUser;
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 = (
? $1 : 'html' ;
my %align = (
@@
-223,9
+228,13
@@
if($type =~ /csv|xls/) {
} while ( exists($h->[$i]) );
}
} while ( exists($h->[$i]) );
}
+# wtf?
$opt{disable_download} = 0
if $opt{disable_download} && $curuser->access_right('Configuration download');
$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'} ) {
my @link_agentnums = ();
my $null_link = '';
if ( $opt{'agent_virt'} ) {
@@
-235,7
+244,9
@@
if ( $opt{'agent_virt'} ) {
|| $opt{'agent_null_right'} );
my $agentnums_sql = $curuser->agentnums_sql(
|| $opt{'agent_null_right'} );
my $agentnums_sql = $curuser->agentnums_sql(
- 'null_right' => $opt{'agent_null_right'}
+ 'null' => $opt{'agent_null'},
+ 'null_right' => $opt{'agent_null_right'},
+ 'table' => $opt{'query'}{'table'},
);
$opt{'query'}{'extra_sql'} .=
);
$opt{'query'}{'extra_sql'} .=
@@
-324,7
+335,7
@@
if ( $opt{'disableable'} ) {
my $limit = '';
my($confmax, $maxrecords, $offset );
my $limit = '';
my($confmax, $maxrecords, $offset );
-
if ( !
$type =~ /^(csv|\w*.xls)$/) {
+
unless (
$type =~ /^(csv|\w*.xls)$/) {
# html mode
unless (exists($opt{count_query}) && length($opt{count_query})) {
( $opt{count_query} = $opt{query} ) =~
# html mode
unless (exists($opt{count_query}) && length($opt{count_query})) {
( $opt{count_query} = $opt{query} ) =~