diff --git a/mozilla/webtools/bugzilla/admineditor.pl b/mozilla/webtools/bugzilla/admineditor.pl index 8ac6d8cf567..6b6287d88d4 100644 --- a/mozilla/webtools/bugzilla/admineditor.pl +++ b/mozilla/webtools/bugzilla/admineditor.pl @@ -59,28 +59,28 @@ $::wentwrong = 'Something went wrong.'; ################################################################################ # What we're editing eg ('resolution', 'Resolution', 'resolutions'). -#my ($::valuetype, $::valuetypeicap, $::valuetypeplural); +($::valuetype, $::valuetypeicap, $::valuetypeplural) = (); # What group you have to be in to edit these. -#my $::grouprestrict; +$::grouprestrict = undef; # The name of the CGI calling the editor. -#my $::thiscgi; +$::thiscgi = undef; # The name of the table that stores what we're editing. -#my $::tablename; +$::tablename = undef; # The name of the table that has references to what we're editing. # This currently doesn't support multiple references. -#my $::bugsreftablename; +$::bugsreftablename = undef; # The full field name of the field that has references to what we're editing, # eg 'bugs.resolution_id'. -#my $::bugsreffieldref; +$::bugsreffieldref = undef; # The maximum number of characters allowed in the name of what we're editing. # Get this information from the schema. -#my $::maxnamesize; +$::maxnamesize = undef; ################################################################################ # The following may be changed by the caller. @@ -239,34 +239,35 @@ sub AdminEditor() { confirm_login(); $::db->{Taint} = 1; + $::db->{Taint} = 1; # Silliness unless (UserInGroup($::grouprestrict)) { - DisplayError("Sorry, you aren't a member of the $::grouprestrict group. " . - "And so, you aren't allowed to add, modify or delete $::valuetypeplural.", - "Not allowed"); - exit; + DisplayError("Sorry, you aren't a member of the $::grouprestrict group. " . + "And so, you aren't allowed to add, modify or delete $::valuetypeplural.", + "Not allowed"); + exit; } # Define the global variables and functions that will be passed to the UI # template. Individual functions add their own values to this hash before # sending them to the templates they process. $vars = { - # Function for retrieving global parameters. - 'Param' => \&Param, - - # Function for processing global parameters that contain references - # to other global parameters. - 'PerformSubsts' => \&PerformSubsts, - - # Uses for links that point back to this script. - 'thiscgi' => $::thiscgi, - - # What we are actually editing. - 'valuetype' => $::valuetype, - 'valuetypeicap' => $::valuetypeicap, - - # Maximum size allowed for a name of this value - 'maxnamesize' => $::maxnamesize, + # Function for retrieving global parameters. + 'Param' => \&Param, + + # Function for processing global parameters that contain references + # to other global parameters. + 'PerformSubsts' => \&PerformSubsts, + + # Uses for links that point back to this script. + 'thiscgi' => $::thiscgi, + + # What we are actually editing. + 'valuetype' => $::valuetype, + 'valuetypeicap' => $::valuetypeicap, + + # Maximum size allowed for a name of this value + 'maxnamesize' => $::maxnamesize, }; &$::extravarsref($vars); @@ -282,43 +283,43 @@ sub AdminEditor() { if ($action eq "list") { - ListScreen(""); + ListScreen(""); } elsif ($action eq "add") { - - CreateScreen(); - + + CreateScreen(); + } elsif ($action eq "new") { - - ValidateName(\%fields); - ValidateDesc(\%fields); - &$::validaterestref(\%fields); - InsertNew(%fields); - + + ValidateName(\%fields); + ValidateDesc(\%fields); + &$::validaterestref(\%fields); + InsertNew(%fields); + } elsif ($action eq "edit") { - - ValidateID(\%fields); - EditScreen(%fields); - + + ValidateID(\%fields); + EditScreen(%fields); + } elsif ($action eq "update") { - - ValidateID(\%fields); - ValidateName(\%fields); - ValidateDesc(\%fields); - ValidateIsActive(\%fields); - &$::validaterestref(\%fields); - UpdateExisting(%fields); - + + ValidateID(\%fields); + ValidateName(\%fields); + ValidateDesc(\%fields); + ValidateIsActive(\%fields); + &$::validaterestref(\%fields); + UpdateExisting(%fields); + } elsif ($action eq "delete") { - - ValidateID(\%fields); - DeleteExisting(%fields); - + + ValidateID(\%fields); + DeleteExisting(%fields); + } else { - - print "Content-type: text/html\n\n"; - ThatDoesntValidate("action"); - + + print "Content-type: text/html\n\n"; + ThatDoesntValidate("action"); + } } @@ -348,7 +349,7 @@ sub ListScreen ($) { $bugcount ||= 0; push( @values, { 'id' => $id, 'name' => $name, 'description' => $description, - 'isactive' => $isactive, 'bugcount' => $bugcount } ); + 'isactive' => $isactive, 'bugcount' => $bugcount } ); } # Define the variables and functions that will be passed to the UI template. @@ -545,7 +546,7 @@ sub DeleteExisting (%) { } if ($bugcount > 0) { - &$::deleterefsref($id); + &$::deleterefsref($id); } SendSQL("DELETE FROM $::tablename WHERE id = $id"); diff --git a/mozilla/webtools/bugzilla/bug_form.pl b/mozilla/webtools/bugzilla/bug_form.pl index 207204d4aa4..223b5cd3d2c 100644 --- a/mozilla/webtools/bugzilla/bug_form.pl +++ b/mozilla/webtools/bugzilla/bug_form.pl @@ -160,7 +160,7 @@ print " - + @@ -190,21 +190,21 @@ print " - + - + - + - + - "; @@ -493,7 +493,7 @@ if ($canedit || $::userid == $assignedtoid || my $resolution_popup = make_options(\@::settable_normal_resolution, $bug{'resolution'}); print " - Resolve bug, changing resolution to + Resolve bug, changing resolution to
\n"; @@ -517,7 +517,7 @@ if ($canedit || $::userid == $assignedtoid || my $assign_element = ""; print " - Reassign bug to + Reassign bug to $assign_element
\n"; if ($status eq $::unconfirmedstate && ($canconfirm || $canedit)) { diff --git a/mozilla/webtools/bugzilla/bug_status.html b/mozilla/webtools/bugzilla/bug_status.cgi old mode 100755 new mode 100644 similarity index 62% rename from mozilla/webtools/bugzilla/bug_status.html rename to mozilla/webtools/bugzilla/bug_status.cgi index f7079aae4c4..3e1ee0537c3 --- a/mozilla/webtools/bugzilla/bug_status.html +++ b/mozilla/webtools/bugzilla/bug_status.cgi @@ -1,34 +1,43 @@ - - +#!/usr/bonsaitools/bin/perl -wT +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Terry Weissman +# Matthew Tuck - +require "CGI.pl"; -A Bug's Life Cycle +# Silliness +my $silly = $::queryable_resolution; -

A Bug's Life Cycle

+ConnectToDatabase(); +GetVersionTable(); -The status and resolution field define and track the +print "Content-type: text/html\n\n"; + +PutHeader("A Bug's Life Cycle"); + +print qq{The status and resolution field define and track the life cycle of a bug. @@ -92,29 +101,22 @@ certain status transitions are allowed.
Bug#:$bug{'bug_id'}  Platform:Platform:   Reporter:$bug{'reporter'}CC: $cc_element
Status:Status: $bug{'bug_status'}  Priority:Priority:  
Resolution:Resolution: $bug{'resolution'}  Severity:Severity:  
Assigned To: + Assigned To: $bug{'assigned_to'}   -
-
FIXED -
A fix for this bug is checked into the tree and tested. -
INVALID -
The problem described is not a bug -
WONTFIX -
The problem described is a bug which will never be fixed. -
LATER -
The problem described is a bug which will not be fixed in this - version of the product. -
REMIND -
The problem described is a bug which will probably not be fixed in this - version of the product, but might still be. -
DUPLICATE -
The problem is a duplicate of an existing bug. Marking a bug - duplicate requires the bug# of the duplicating bug and will at - least put that bug number in the description field. -
WORKSFORME -
All attempts at reproducing this bug were futile, reading the - code produces no clues as to why this behavior would occur. If - more information appears later, please re-assign the bug, for - now, file it. -
+
}; + +SendSQL("SELECT name, description FROM resolutions"); + +while (MoreSQLData()) { + my ($name, $description) = FetchSQLData(); + if (lsearch(\@::queryable_resolution, $name) != -1) { + $name = html_quote($name); + $description = html_quote($description); + + print "
$name\n"; + print "
$description\n"; + } +} + +print qq{

Other Fields

@@ -182,21 +184,19 @@ operating systems include:
  • Linux -Note that the operating system implies the platform, but not always. -For example, Linux can run on PC and Macintosh and others. +

    Note that the operating system implies the platform, but not always. +For example, Linux can run on PC and Macintosh and others.

    Assigned To

    -This is the person in charge of resolving the bug. Every time this -field changes, the status changes to NEW to make it easy to see -which new bugs have appeared on a person's list. +

    This is the person in charge of resolving the bug. Every time this +field changes, the status changes to NEW to make it easy to see +which new bugs have appeared on a person's list.

    -The default status for queries is set to NEW, ASSIGNED and REOPENED. When +

    The default status for queries is set to NEW, ASSIGNED and REOPENED. When searching for bugs that have been resolved or verified, remember to set the -status field appropriately. +status field appropriately.

    -
    - -Last modified: Thu Aug 23 03:04:27 2000 - - +}; + +PutFooter(); diff --git a/mozilla/webtools/bugzilla/buglist.cgi b/mozilla/webtools/bugzilla/buglist.cgi index 475c7e51eb0..77babf57339 100755 --- a/mozilla/webtools/bugzilla/buglist.cgi +++ b/mozilla/webtools/bugzilla/buglist.cgi @@ -1475,15 +1475,15 @@ document.write(\" Version: - Platform: + Platform: - Priority: + Priority: Component: - Severity: + Severity: "; @@ -1624,7 +1624,7 @@ if($::usergroupset ne '0') { $knum++; print " - Resolve bugs, changing resolution to + Resolve bugs, changing resolution to
    "; @@ -1654,7 +1654,7 @@ if($::usergroupset ne '0') { } print " - Reassign bugs to + Reassign bugs to
    "; diff --git a/mozilla/webtools/bugzilla/confirmhelp.html b/mozilla/webtools/bugzilla/confirmhelp.html index 1dad973028a..5ab4f9303e2 100644 --- a/mozilla/webtools/bugzilla/confirmhelp.html +++ b/mozilla/webtools/bugzilla/confirmhelp.html @@ -42,7 +42,7 @@ hopefully glance over their UNCONFIRMED bugs regularly.)

    -The page describing bug fields has been +The page describing bug fields has been updated to include UNCONFIRMED.

    diff --git a/mozilla/webtools/bugzilla/editproducts.cgi b/mozilla/webtools/bugzilla/editproducts.cgi index f602c351ee8..d67d3474cef 100755 --- a/mozilla/webtools/bugzilla/editproducts.cgi +++ b/mozilla/webtools/bugzilla/editproducts.cgi @@ -132,7 +132,7 @@ sub EmitFormElements ($$$$$$$$$) print " \n"; print "\n"; - print " Number of votes a bug in this product needs to automatically get out of the UNCONFIRMED state:\n"; + print " Number of votes a bug in this product needs to automatically get out of the UNCONFIRMED state:\n"; print " \n"; } diff --git a/mozilla/webtools/bugzilla/enter_bug.cgi b/mozilla/webtools/bugzilla/enter_bug.cgi index b5fcafd9a5a..77c286d8a42 100755 --- a/mozilla/webtools/bugzilla/enter_bug.cgi +++ b/mozilla/webtools/bugzilla/enter_bug.cgi @@ -329,9 +329,9 @@ print "   - Platform: + Platform: $platform_popup - OS: + OS: $opsys_popup @@ -340,14 +340,14 @@ print " "; if (Param('letsubmitterchoosepriority')) { print " - Resolution
    Priority    :     + Resolution
    Priority    :     $priority_popup"; } else { print ''; } print " - Severity: + Severity: $sev_popup @@ -361,7 +361,7 @@ if (UserInGroup("editbugs") || UserInGroup("canconfirm")) { if (FetchOneColumn()) { print qq{ - Initial state: + Initial state: }; print BuildPulldown("bug_status", @@ -374,7 +374,7 @@ if (UserInGroup("editbugs") || UserInGroup("canconfirm")) { print " - Assigned To: + Assigned To: $assign_element (Leave blank to assign to default component owner) diff --git a/mozilla/webtools/bugzilla/quicksearchhack.html b/mozilla/webtools/bugzilla/quicksearchhack.html index 7d788f62621..2e85940115f 100644 --- a/mozilla/webtools/bugzilla/quicksearchhack.html +++ b/mozilla/webtools/bugzilla/quicksearchhack.html @@ -75,7 +75,7 @@ for access speed): UNCO,NEW,...,CLOS,
    FIX,DUP,... (as first word)     status   - Status + Status ("bug_status") @@ -83,35 +83,35 @@ for access speed):   resolution   - Resolution + Resolution   as-is platform   - Platform ("rep_platform") + Platform ("rep_platform")     os opsys - OS ("op_sys") + OS ("op_sys")   p1,p2 or p1-2 priority pri - Priority + Priority   blo,cri,...,enh severity sev - Severity ("bug_severity") + Severity ("bug_severity") @@ -122,7 +122,7 @@ for access speed): @owner assignedto assignee, owner - Assignee ("assigned_to") + Assignee ("assigned_to")