Bug 300699: Remove dead code from editproducts.cgi and messages.html.tmpl - Patch...

diff --git a/editproducts.cgi b/editproducts.cgi
index 768e96a349a431e4f0e7f0b8380a6fd440a39412..5e48b958e0a92a3648bc2d8590bf30a27a50312d 100755 (executable)
--- a/editproducts.cgi
+++ b/editproducts.cgi
@@ -1441,184 +1441,6 @@ if ($action eq 'editgroupcontrols') {
     $template->process("admin/products/groupcontrol/edit.html.tmpl", $vars)
         || ThrowTemplateError($template->error());
     exit;                
-
-    print "<!-- \n";
-    print "<script type=\"text/javascript\">\n";
-    print "function hide(id) {\n";
-    print "  id.visibility = 0\n";
-    print "  alert(id)\n";
-    print "}\n";
-    print "</script>";
-    print " -->\n";
-        print "<STYLE type=\"text/css\">\n";
-        print "  .hstyle { visibility: visible; color: red; }\n";
-        print "</STYLE>\n";
-    print "<FORM METHOD=POST ACTION=editproducts.cgi>\n";
-    print "<TABLE BORDER=1 CELLPADDING=4 CELLSPACING=0><TR BGCOLOR=\"#6666FF\">\n";
-    print "  <TH ALIGN=\"left\">Group</TH>\n";
-    print "  <TH ALIGN=\"left\">Entry</TH>\n";
-    print "  <TH ALIGN=\"left\">MemberControl</TH>\n";
-    print "  <TH ALIGN=\"left\">OtherControl</TH>\n";
-    print "  <TH ALIGN=\"left\">Canedit</TH>\n";
-    while (MoreSQLData()) {
-        print "</TR>\n";
-        my ($groupid, $groupname, $entry, $membercontrol, $othercontrol, 
-            $canedit) = FetchSQLData();
-        print "<TR id=\"row_$groupname\" class=\"hstyle\" ";
-        print "onload=\"document.row.row_$groupname.color=green\">\n";
-        print "  <TD>\n";
-        print "    $groupname\n";
-        print "  </TD><TD>\n";
-        $entry |= 0;
-        print "    <INPUT TYPE=CHECKBOX NAME=\"entry_$groupid\" VALUE=1";
-        print " CHECKED " if $entry;
-        print ">\n";
-        print "  </TD><TD>\n";
-        $membercontrol |= 0;
-        $othercontrol |= 0;
-        print "    <SELECT NAME=\"membercontrol_$groupid\">\n";
-        print "      <OPTION VALUE=" . CONTROLMAPNA;
-        print " selected=\"selected\"" if ($membercontrol == CONTROLMAPNA);
-        print ">NA</OPTION>\n";
-        print "      <OPTION VALUE=" . CONTROLMAPSHOWN;
-        print " selected=\"selected\"" if ($membercontrol == CONTROLMAPSHOWN);
-        print ">Shown</OPTION>\n";
-        print "      <OPTION VALUE=" . CONTROLMAPDEFAULT;
-        print " selected=\"selected\"" if ($membercontrol == CONTROLMAPDEFAULT);
-        print ">Default</OPTION>\n";
-        print "      <OPTION VALUE=" . CONTROLMAPMANDATORY;
-        print " selected=\"selected\"" if ($membercontrol == CONTROLMAPMANDATORY);
-        print ">Mandatory</OPTION>\n";
-        print "</SELECT>\n";
-        print "  </TD><TD>\n";
-        print "    <SELECT NAME=\"othercontrol_$groupid\">\n";
-        print "      <OPTION VALUE=" . CONTROLMAPNA;
-        print " selected=\"selected\"" if ($othercontrol == CONTROLMAPNA);
-        print ">NA</OPTION>\n";
-        print "      <OPTION VALUE=" . CONTROLMAPSHOWN;
-        print " selected=\"selected\"" if ($othercontrol == CONTROLMAPSHOWN);
-        print ">Shown</OPTION>\n";
-        print "      <OPTION VALUE=" . CONTROLMAPDEFAULT;
-        print " selected=\"selected\"" if ($othercontrol == CONTROLMAPDEFAULT);
-        print ">Default</OPTION>\n";
-        print "      <OPTION VALUE=" . CONTROLMAPMANDATORY;
-        print " selected=\"selected\"" if ($othercontrol == CONTROLMAPMANDATORY);
-        print ">Mandatory</OPTION>\n";
-        print "</SELECT>\n";
-        print "  </TD><TD>\n";
-        $canedit |= 0;
-        print "    <INPUT TYPE=CHECKBOX NAME=\"canedit_$groupid\" VALUE=1";
-        print " CHECKED " if $canedit;
-        print ">\n";
-
-    }
-
-    print "</TR>\n";
-    print "</TABLE><BR>";
-    print "Add controls to the panel above:<BR>\n";
-    print "<SELECT NAME=\"newgroups\" SIZE=\"10\" MULTIPLE=\"MULTIPLE\">\n";
-    SendSQL("SELECT id, name " .
-            "FROM groups " .
-            "LEFT JOIN group_control_map " .
-            "ON group_control_map.group_id = id AND product_id = $product_id " .
-            "WHERE canedit IS NULL AND isbuggroup != 0 AND isactive != 0 " .
-            "ORDER BY name");
-    while (MoreSQLData()) {
-        my ($groupid, $groupname) = FetchSQLData();
-        print "<OPTION VALUE=\"$groupid\">$groupname</OPTION>\n";
-    }
-    print "</SELECT><BR><BR>\n";
-
-    print "<INPUT TYPE=SUBMIT VALUE=\"Update\">\n";
-    print "<INPUT TYPE=RESET>\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"action\" VALUE=\"updategroupcontrols\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"product\" VALUE=\"$product\">\n";
-    print "</FORM>\n";
-    print "<P>note: Any group controls Set to NA/NA with no other checkboxes ";
-    print "will automatically be removed from the panel the next time ";
-    print "update is clicked.\n";
-    print "<P>These settings control the relationship of the groups to this ";
-    print "product.\n";
-    print "<P>If any group has <B>Entry</B> selected, then this product will ";
-    print "restrict bug entry to only those users who are members of all the ";
-    print "groups with entry selected.\n";
-    print "<P>If any group has <B>Canedit</B> selected, then this product ";
-    print "will be read-only for any users who are not members of all of ";
-    print "the groups with Canedit selected. ONLY users who are members of ";
-    print "all the canedit groups will be able to edit. This is an additional ";
-    print "restriction that further restricts what can be edited by a user.\n";
-    print "<P>The <B>MemberControl</B> and <B>OtherControl</B> fields ";
-    print "indicate which bugs will be placed in ";
-    print "this group according to the following definitions.\n";
-    print "<BR><TABLE BORDER=1>";
-    print "<TR>";
-    print "<TH>MemberControl</TH><TH>OtherControl</TH><TH>Interpretation</TH>";
-    print "</TR><TR>";
-    print "<TD>NA</TD>\n";
-    print "<TD>NA</TD>\n";
-    print "<TD>Bugs in this product are never associated with this group.</TD>\n";
-    print "</TR><TR>";
-    print "<TD>Shown</TD>\n";
-    print "<TD>NA</TD>\n";
-    print "<TD>Bugs in this product are permitted to be restricted to this ";
-    print "group.  Users who are members of this group will be able ";
-    print "to place bugs in this group.</TD>\n";
-    print "</TR><TR>";
-    print "<TD>Shown</TD>\n";
-    print "<TD>Shown</TD>\n";
-    print "<TD>Bugs in this product can be placed in this group by anyone ";
-    print "with permission to edit the bug even if they are not a member ";
-    print "of this group.</TD>\n";
-    print "</TR><TR>";
-    print "<TD>Shown</TD>\n";
-    print "<TD>Default</TD>\n";
-    print "<TD>Bugs in this product can be placed in this group by anyone ";
-    print "with permission to edit the bug even if they are not a member ";
-    print "of this group. Non-members place bugs in this group by default.";
-    print "</TD>\n";
-    print "</TR><TR>";
-    print "<TD>Shown</TD>\n";
-    print "<TD>Mandatory</TD>\n";
-    print "<TD>Bugs in this product are permitted to be restricted to this ";
-    print "group.  Users who are members of this group will be able ";
-    print "to place bugs in this group.";
-    print "Non-members will be forced to restrict bugs to this group ";
-    print "when they initially enter a bug in this product.";
-    print "</TD>\n";
-    print "</TR><TR>";
-    print "<TD>Default</TD>\n";
-    print "<TD>NA</TD>\n";
-    print "<TD>Bugs in this product are permitted to be restricted to this ";
-    print "group and are placed in this group by default.";
-    print "Users who are members of this group will be able ";
-    print "to place bugs in this group.</TD>\n";
-    print "</TR><TR>";
-    print "<TD>Default</TD>\n";
-    print "<TD>Default</TD>\n";
-    print "<TD>Bugs in this product are permitted to be restricted to this ";
-    print "group and are placed in this group by default.";
-    print "Users who are members of this group will be able ";
-    print "to place bugs in this group. Non-members will be able to ";
-    print "restrict bugs to this group on entry and will do so by default ";
-    print "</TD>\n";
-    print "</TR><TR>";
-    print "<TD>Default</TD>\n";
-    print "<TD>Mandatory</TD>\n";
-    print "<TD>Bugs in this product are permitted to be restricted to this ";
-    print "group and are placed in this group by default.";
-    print "Users who are members of this group will be able ";
-    print "to place bugs in this group. Non-members will be forced ";
-    print "to place bugs in this group on entry.";
-    print "</TR><TR>";
-    print "<TD>Mandatory</TD>\n";
-    print "<TD>Mandatory</TD>\n";
-    print "<TD>Bugs in this product are required to be restricted to this ";
-    print "group.  Users are not given any option.</TD>\n";
-    print "</TABLE>";
-
-
-    PutTrailer($localtrailer);
-    exit;
 }
 
 

diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 30855ed379e5f415a47b89ab91c498b950d4bf48..156bab3d89546e1b4da147119e3d4bf1affd6659 100644 (file)
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -94,7 +94,6 @@
       You didn't request any change on the user account
       [%+ otheruser.login FILTER html %].
     [% END %]
-    [%# changed_fields.join(', ') %]
 
   [% ELSIF message_tag == "account_deleted" %]
     [% title = "User $otheruser.login deleted" %]