From 819d82e8800b9ea271bfda7a2b49e224bb50c338 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Mon, 15 Aug 2016 15:24:35 -0700 Subject: [PATCH] in grouped payment search, only show tabs when there's more than one group, #71364 --- httemplate/search/elements/grouped-search/core | 14 ++++++++------ httemplate/search/elements/grouped-search/html | 6 ++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/httemplate/search/elements/grouped-search/core b/httemplate/search/elements/grouped-search/core index ffa8cee39..3d38a8c7e 100644 --- a/httemplate/search/elements/grouped-search/core +++ b/httemplate/search/elements/grouped-search/core @@ -131,12 +131,14 @@ for my $i (0 .. scalar(@groups) - 1) { } if ( $opt{show_combined} ) { - # set up group 0 as a combined view - unshift @groups, $totals; - unshift @group_labels, 'All ' . PL($opt{name_singular}) . - ' (' . $totals->num_rows . ')'; - unshift @group_footers, []; # the total footer will suffice - unshift @queries, $base_query->clone; + if ( @groups > 1 ) { + # set up group 0 as a combined view + unshift @groups, $totals; + unshift @group_labels, 'All ' . PL($opt{name_singular}) . + ' (' . $totals->num_rows . ')'; + unshift @group_footers, []; # the total footer will suffice + unshift @queries, $base_query->clone; + } } my @total_footer; diff --git a/httemplate/search/elements/grouped-search/html b/httemplate/search/elements/grouped-search/html index df1471a52..293da338f 100644 --- a/httemplate/search/elements/grouped-search/html +++ b/httemplate/search/elements/grouped-search/html @@ -67,8 +67,10 @@ if ( $group->num_rows > scalar(@rows) ) { # set up tab bar my @menubar; -for (my $i = 0; $i < $group_info->{num}; $i++) { - push @menubar, $group_info->{group_labels}[$i], ";group=$i"; +if ($group_info->{num} > 1) { + for (my $i = 0; $i < $group_info->{num}; $i++) { + push @menubar, $group_info->{group_labels}[$i], ";group=$i"; + } } # not enabled yet; if we need this at some point, enable it on a per-report -- 2.11.0