summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjake%acutex.net <>2001-06-29 00:42:29 +0200
committerjake%acutex.net <>2001-06-29 00:42:29 +0200
commitc08d220d3a39f92df2bd951817fd7b674a3278da (patch)
treeb7d368b8593d98163ce3a60e5cbfbffe68669fc7
parent505ec782013469bf7c5fbfec3ba98ddd2841df46 (diff)
downloadbugzilla-c08d220d3a39f92df2bd951817fd7b674a3278da.tar.gz
bugzilla-c08d220d3a39f92df2bd951817fd7b674a3278da.tar.xz
Refix bug 80289. Don't print header for groups if there aren't any groups to display (was printing a header without groups in rare instances).
Patch by Joe Robins <jmrobins@tgix.com> r= jake@acutex.net
-rw-r--r--bug_form.pl9
-rwxr-xr-xenter_bug.cgi10
2 files changed, 12 insertions, 7 deletions
diff --git a/bug_form.pl b/bug_form.pl
index 139e2fcf4..27c19e74c 100644
--- a/bug_form.pl
+++ b/bug_form.pl
@@ -379,9 +379,7 @@ if ($::usergroupset ne '0') {
"order by description");
# We only print out a header bit for this section if there are any
# results.
- if(MoreSQLData()) {
- print "<br><b>Only users in the selected groups can view this bug:</b><br>\n";
- }
+ my $groupFound = 0;
while (MoreSQLData()) {
my ($bit, $name, $description, $ison) = (FetchSQLData());
# For product groups, we only want to display the checkbox if either
@@ -390,6 +388,11 @@ if ($::usergroupset ne '0') {
# All other product groups will be skipped. Non-product bug groups
# will still be displayed.
if($ison || ($name eq $bug{'product'}) || (!defined $::proddesc{$name})) {
+ if(!$groupFound) {
+ print "<br><b>Only users in the selected groups can view this bug:</b><br>\n";
+ print "<font size=\"-1\">(Leave all boxes unchecked to make this a public bug.)</font><br><br>\n";
+ $groupFound = 1;
+ }
# Modifying this to use checkboxes instead
my $checked = $ison ? " CHECKED" : "";
# indent these a bit
diff --git a/enter_bug.cgi b/enter_bug.cgi
index c78628a6c..c1f4e61b1 100755
--- a/enter_bug.cgi
+++ b/enter_bug.cgi
@@ -413,16 +413,18 @@ if ($::usergroupset ne '0') {
" AND isbuggroup != 0 AND isactive = 1 ORDER BY description");
# We only print out a header bit for this section if there are any
# results.
- if(MoreSQLData()) {
- print "<br><b>Only users in the selected groups can view this bug:</b><br>\n";
- print "<font size=\"-1\">(Leave all boxes unchecked to make this a public bug.)</font><br><br>\n";
- }
+ my $groupFound = 0;
while (MoreSQLData()) {
my ($bit, $prodname, $description) = (FetchSQLData());
# Don't want to include product groups other than this product.
unless(($prodname eq $product) || (!defined($::proddesc{$prodname}))) {
next;
}
+ if(!$groupFound) {
+ print "<br><b>Only users in the selected groups can view this bug:</b><br>\n";
+ print "<font size=\"-1\">(Leave all boxes unchecked to make this a public bug.)</font><br><br>\n";
+ $groupFound = 1;
+ }
# Rather than waste time with another Param check and another database
# access, $group_bit will only have a non-zero value if we're using
# bug groups and have one for this product, so I'll check on that