projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disable quotations, RT#20688, RT#22232
[freeside.git]
/
httemplate
/
search
/
elements
/
search.html
diff --git
a/httemplate/search/elements/search.html
b/httemplate/search/elements/search.html
index
5a16a22
..
62a0e47
100644
(file)
--- a/
httemplate/search/elements/search.html
+++ b/
httemplate/search/elements/search.html
@@
-43,7
+43,7
@@
Example:
#listref of column labels, <TH>
#recommended unless 'query' is an SQL query string
#listref of column labels, <TH>
#recommended unless 'query' is an SQL query string
- # (if not specified the database column names will be used)
+ # (if not specified the database column names will be used)
(XXX this is not currently working either)
'header' => [ '#',
'Item',
{ 'label' => 'Another Item',
'header' => [ '#',
'Item',
{ 'label' => 'Another Item',
@@
-52,7
+52,7
@@
Example:
],
#listref - each item is a literal column name (or method) or coderef
],
#listref - each item is a literal column name (or method) or coderef
- #if not specified all columns will be shown
+ #if not specified all columns will be shown
(XXX this is not currently working?)
'fields' => [
'column',
sub { my $row = shift; $row->column; },
'fields' => [
'column',
sub { my $row = shift; $row->column; },
@@
-130,7
+130,7
@@
Example:
'agent_pos' => 3, # optional position (starting from 0) to
# insert an Agent column (query needs to be a
# qsearch hashref and header & fields need to
'agent_pos' => 3, # optional position (starting from 0) to
# insert an Agent column (query needs to be a
# qsearch hashref and header & fields need to
- # be defined)
+ # be defined)
cust_pkg_susp.html
# sort, link & display properties for fields
# sort, link & display properties for fields
@@
-141,7
+141,7
@@
Example:
# or a listref of link and method name to append,
# or a listref of link and coderef to run and append
# or a coderef that returns such a listref
# or a listref of link and method name to append,
# or a listref of link and coderef to run and append
# or a coderef that returns such a listref
- 'links' => [],
`
+ 'links' => [],
#listref - each item is the empty string,
# or a string onClick handler for the corresponding link
#listref - each item is the empty string,
# or a string onClick handler for the corresponding link
@@
-167,6
+167,11
@@
Example:
# miscellany
'download_label' => 'Download this report',
# defaults to 'Download full results'
# miscellany
'download_label' => 'Download this report',
# defaults to 'Download full results'
+ 'link_field' => 'pkgpart'
+ # will create internal links for each row,
+ # with the value of this field as the NAME attribute
+ # If this is a coderef, will evaluate it, passing the
+ # row as an argument, and use the result as the NAME.
&>
</%doc>
&>
</%doc>
@@
-302,9
+307,11
@@
if ( $opt{'disableable'} ) {
$opt{'query'}{'hashref'}{'disabled'} = '';
$opt{'query'}{'extra_sql'} =~ s/^\s*WHERE/ AND/i;
$opt{'query'}{'hashref'}{'disabled'} = '';
$opt{'query'}{'extra_sql'} =~ s/^\s*WHERE/ AND/i;
+ my $table = $opt{'query'}{'table'};
+
$opt{'count_query'} .=
( $opt{'count_query'} =~ /WHERE/i ? ' AND ' : ' WHERE ' ).
$opt{'count_query'} .=
( $opt{'count_query'} =~ /WHERE/i ? ' AND ' : ' WHERE ' ).
- "(
disabled = '' OR
disabled IS NULL )";
+ "(
$table.disabled = '' OR $table.
disabled IS NULL )";
} elsif ( $opt{'disabled_statuspos'}
|| $opt{'disabled_statuspos'} eq '0' ) { #add status column
} elsif ( $opt{'disabled_statuspos'}
|| $opt{'disabled_statuspos'} eq '0' ) { #add status column
@@
-348,19
+355,13
@@
if ( $opt{'disableable'} ) {
my $limit = '';
my($confmax, $maxrecords, $offset );
my $limit = '';
my($confmax, $maxrecords, $offset );
-unless ( $type =~ /^(csv|\w*.xls)$/) {
+unless ( $type =~ /^(csv|
xml|
\w*.xls)$/) {
# html mode
unless (exists($opt{count_query}) && length($opt{count_query})) {
( $opt{count_query} = $opt{query} ) =~
s/^\s*SELECT\s*(.*?)\s+FROM\s/SELECT COUNT(*) FROM /i; #silly vim:/
}
# html mode
unless (exists($opt{count_query}) && length($opt{count_query})) {
( $opt{count_query} = $opt{query} ) =~
s/^\s*SELECT\s*(.*?)\s+FROM\s/SELECT COUNT(*) FROM /i; #silly vim:/
}
- if ( $opt{disableable} && ! $cgi->param('showdisabled') ) {
- $opt{count_query} .=
- ( ( $opt{count_query} =~ /WHERE/i ) ? ' AND ' : ' WHERE ' ).
- "( disabled = '' OR disabled IS NULL )";
- }
-
unless ( $type eq 'html-print' ) {
#setup some pagination things if we're in html mode
unless ( $type eq 'html-print' ) {
#setup some pagination things if we're in html mode
@@
-427,7
+428,7
@@
if ( ref($opt{query}) ) {
}
#eval "use FS::$opt{'query'};";
}
#eval "use FS::$opt{'query'};";
- my @param = qw( select table addl_from hashref extra_sql order_by );
+ my @param = qw( select table addl_from hashref extra_sql order_by
debug
);
$rows = [ qsearch( [ map { my $query = $_;
({ map { $_ => $query->{$_} } @param });
}
$rows = [ qsearch( [ map { my $query = $_;
({ map { $_ => $query->{$_} } @param });
}
@@
-448,4
+449,6
@@
if ( ref($opt{query}) ) {
$header ||= $sth->{NAME};
}
$header ||= $sth->{NAME};
}
+push @$rows, $opt{'footer_data'} if $opt{'footer_data'};
+
</%init>
</%init>