Fix for bug #53612: The milestone URL appears correctly when deleting a product or...

Patch by Jake <jake@acutex.net>.
r=gerv@mozilla.org,myk@mozilla.org

diff --git a/editcomponents.cgi b/editcomponents.cgi
index 30f9dd4ead50c79328f6894ce403d271ed60fda4..f48612d75ea48b79dd99a5606f647aad199618c2 100755 (executable)
--- a/editcomponents.cgi
+++ b/editcomponents.cgi
@@ -487,9 +487,9 @@ if ($action eq 'del') {
 
     my $initialowner = $initialownerid ? DBID_to_name ($initialownerid) : "<FONT COLOR=\"red\">missing</FONT>";
     my $initialqacontact = $initialqacontactid ? DBID_to_name ($initialqacontactid) : "<FONT COLOR=\"red\">missing</FONT>";
-
+    my $milestonelink = $milestoneurl ? "<A HREF=\"$milestoneurl\">$milestoneurl</A>"
+                                      : "<FONT COLOR=\"red\">missing</FONT>";
     $pdesc            ||= "<FONT COLOR=\"red\">missing</FONT>";
-    $milestoneurl     ||= "<FONT COLOR=\"red\">missing</FONT>";
     $disallownew        = $disallownew ? 'closed' : 'open';
     $cdesc            ||= "<FONT COLOR=\"red\">missing</FONT>";
     
@@ -530,7 +530,7 @@ if ($action eq 'del') {
     if (Param('usetargetmilestone')) {
          print "</TR><TR>\n";
          print "  <TD VALIGN=\"top\">Milestone URL:</TD>\n";
-         print "  <TD VALIGN=\"top\"><A HREF=\"$milestoneurl\">$milestoneurl</A></TD>\n";
+         print "  <TD VALIGN=\"top\">$milestonelink</TD>\n";
     }
 
     print "</TR><TR>\n";

diff --git a/editproducts.cgi b/editproducts.cgi
index 73fdbf4874709fb95ea355feadb6e6c8f4cc21f0..f7d479f1d0f36f04d4a06c398acf47962a382132 100755 (executable)
--- a/editproducts.cgi
+++ b/editproducts.cgi
@@ -418,6 +418,8 @@ if ($action eq 'del') {
              FROM products
              WHERE product=" . SqlQuote($product));
     my ($description, $milestoneurl, $disallownew) = FetchSQLData();
+    my $milestonelink = $milestoneurl ? "<a href=\"$milestoneurl\">$milestoneurl</a>"
+                                      : "<font color=\"red\">missing</font>";
     $description ||= "<FONT COLOR=\"red\">description missing</FONT>";
     $disallownew = $disallownew ? 'closed' : 'open';
     
@@ -437,7 +439,7 @@ if ($action eq 'del') {
     if (Param('usetargetmilestone')) {
         print "</TR><TR>\n";
         print "  <TD VALIGN=\"top\">Milestone URL:</TD>\n";
-        print "  <TD VALIGN=\"top\"><A HREF=\"$milestoneurl\">$milestoneurl</A></TD>\n";
+        print "  <TD VALIGN=\"top\">$milestonelink</TD>\n";
     }
 
     # Added -JMR, 2/16/00