diff options
| author | Mark Wells <mark@freeside.biz> | 2016-12-01 14:35:59 -0800 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2016-12-01 14:39:46 -0800 |
| commit | 0ed150d5dd7027513942b74eb362460bc7c2e884 (patch) | |
| tree | d68ceca5ed60478b20d13b720db523e409235268 | |
| parent | 85d0dbbdb844857f17192c5f0740f63c9681b9e6 (diff) | |
fix subtotal and per-group item count on payment report, #25944 and #71364
| -rw-r--r-- | httemplate/search/elements/grouped-search/core | 2 | ||||
| -rw-r--r-- | httemplate/search/elements/grouped-search/html | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/httemplate/search/elements/grouped-search/core b/httemplate/search/elements/grouped-search/core index 3d38a8c7e..b15fe8659 100644 --- a/httemplate/search/elements/grouped-search/core +++ b/httemplate/search/elements/grouped-search/core @@ -110,7 +110,7 @@ for my $i (0 .. scalar(@groups) - 1) { push @group_labels, $label; my @footer; - if ($opt{'subtotal_row'}) { + if ($opt{'subtotal_row'} and @groups > 1) { for( my $col = 0; exists($opt{'subtotal_row'}[$col]) or exists($opt{'header'}[$col]); $col++ diff --git a/httemplate/search/elements/grouped-search/html b/httemplate/search/elements/grouped-search/html index 9c2418af8..28d00404b 100644 --- a/httemplate/search/elements/grouped-search/html +++ b/httemplate/search/elements/grouped-search/html @@ -106,14 +106,18 @@ if ($group_info->{num} > 1) { &> <DIV CLASS="fstabcontainer"> +% if ( $group->num_rows > 0 ) { +<P><% emt('[quant,_1,_2]', $group->num_rows, $opt{name_singular}) %> +</P> %# download links -<P><% emt('Download full results') %><BR> +<P><% emt('Download results:') %> % $cgi->param('type', 'xls'); -<A HREF="<% $cgi->self_url %>"><% emt('as Excel spreadsheet') %></A><BR> +<A HREF="<% $cgi->self_url %>"><% emt('Spreadsheet') %></A> | % $cgi->param('type', 'html-print'); -<A HREF="<% $cgi->self_url %>"><% emt('as printable copy') %></A><BR> +<A HREF="<% $cgi->self_url %>"><% emt('webpage') %></A> % $cgi->delete('type'); </P> +% } <% $pager %> |