Checking in Jake's <jake@acutex.net> interim patches from bug 30694. Bugzilla was...

diff --git a/duplicates.cgi b/duplicates.cgi
index c9c692ca3c0d5d20349e583bbabbcf948bf11619..6bb4e20ab97c99ec276e4fbf4fa12c056378b64f 100755 (executable)
--- a/duplicates.cgi
+++ b/duplicates.cgi
@@ -139,9 +139,10 @@ my $i = 0;
 foreach (@sortedcount)
 {
        my $id = $_;
-       SendSQL("SELECT component, bug_severity, op_sys, target_milestone, short_desc FROM " . 
-                                                                                                  "bugs WHERE bug_id = $id");
-       my ($component, $severity, $op_sys, $milestone, $summary) = FetchSQLData();
+       SendSQL("SELECT component, bug_severity, op_sys, target_milestone, short_desc, groupset " .
+                 " FROM bugs WHERE bug_id = $id");
+       my ($component, $severity, $op_sys, $milestone, $summary, $groupset) = FetchSQLData();
+        next unless $groupset == 0;
         $summary = html_quote($summary);
        print "<tr>";
        print '<td><center><A HREF="show_bug.cgi?id=' . $id . '">';

diff --git a/globals.pl b/globals.pl
index 4ba85ed90b739f6de8a1ef3a70798ce1b0ef0376..d112b0c8fbb14c39af8c2ca9dc1a830ac64af50a 100644 (file)
--- a/globals.pl
+++ b/globals.pl
@@ -775,9 +775,9 @@ sub GetBugLink {
     PushGlobalSQLState();
     
     # Get this bug's info from the SQL Database
-    SendSQL("select bugs.bug_status, resolution, short_desc
+    SendSQL("select bugs.bug_status, resolution, short_desc, groupset
              from bugs where bugs.bug_id = $bug_num");
-    my ($bug_stat, $bug_res, $bug_desc) = (FetchSQLData());
+    my ($bug_stat, $bug_res, $bug_desc, $bug_grp) = (FetchSQLData());
     
     # Format the retrieved information into a link
     if ($bug_stat eq "UNCONFIRMED") { $link_return .= "<i>" }
@@ -786,7 +786,8 @@ sub GetBugLink {
     $link_text = value_quote($link_text);
     $link_return .= qq{<a href="show_bug.cgi?id=$bug_num" title="$bug_stat};
     if ($bug_res ne "") {$link_return .= " $bug_res"}
-    $link_return .= qq{ - $bug_desc">$link_text</a>};
+    if ($bug_grp == 0) { $link_return .= " - $bug_desc" }
+    $link_return .= qq{">$link_text</a>};
     if ($bug_res ne "") { $link_return .= "</strike>" }
     if ($bug_stat eq "UNCONFIRMED") { $link_return .= "</i>"}
     

diff --git a/show_bug.cgi b/show_bug.cgi
index 1dd1f882015d4454cbcf39c84623b0108e38e38a..83baa42b50ec40d966ad96f39148ff7c44844324 100755 (executable)
--- a/show_bug.cgi
+++ b/show_bug.cgi
@@ -47,9 +47,9 @@ if (!defined $::FORM{'id'} || $::FORM{'id'} !~ /^\s*\d+\s*$/) {
 
 GetVersionTable();
 
-SendSQL("select short_desc from bugs where bug_id = $::FORM{'id'}");
-my $summary = FetchOneColumn();
-if( $summary ) {
+SendSQL("select short_desc, groupset from bugs where bug_id = $::FORM{'id'}");
+my ($summary, $groupset) = FetchSQLData();
+if( $summary && $groupset == 0) {
     $summary = html_quote($summary);
     PutHeader("Bug $::FORM{'id'} - $summary", "Bugzilla Bug $::FORM{'id'}", $summary );
 }else {