From 8681814366a81435166c7690ae21805ab4d26039 Mon Sep 17 00:00:00 2001
From: vfilippov
Date: Thu, 11 Mar 2010 11:37:19 +0000
Subject: [PATCH] Bug 40933 - Merge with Bugzilla 3.4.6
git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@680 6955db30-a419-402b-8a0d-67ecbb4d7f56
---
Bugzilla/Constants.pm | 9 +-
Bugzilla/User.pm | 3 +
Bugzilla/WebService/Constants.pm | 2 +
Bugzilla/WebService/Server.pm | 2 +
buglist.cgi | 10 +-
contrib/bugzilla_ldapsync.rb | 2 -
contrib/sendbugmail.pl | 2 -
contrib/yp_nomail.sh | 1 -
docs/en/html/Bugzilla-Guide.html | 261 +++++++-----------
docs/en/html/about.html | 8 +-
docs/en/html/administration.html | 6 +-
docs/en/html/api/Bugzilla.html | 4 +-
docs/en/html/api/Bugzilla/DB.html | 184 +++++++++---
docs/en/html/api/Bugzilla/DB/Schema.html | 8 +-
docs/en/html/api/Bugzilla/Field.html | 56 +++-
docs/en/html/api/Bugzilla/Flag.html | 12 +-
docs/en/html/api/Bugzilla/FlagType.html | 8 +-
docs/en/html/api/Bugzilla/Hook.html | 36 ++-
docs/en/html/api/Bugzilla/Install/CPAN.html | 4 +-
.../api/Bugzilla/Install/Requirements.html | 16 +-
docs/en/html/api/Bugzilla/Install/Util.html | 36 ++-
docs/en/html/api/Bugzilla/Object.html | 8 +-
docs/en/html/api/Bugzilla/Product.html | 4 +-
docs/en/html/api/Bugzilla/Util.html | 8 +-
docs/en/html/api/Bugzilla/WebService/Bug.html | 116 ++++++--
.../api/Bugzilla/WebService/Bugzilla.html | 16 +-
.../html/api/Bugzilla/WebService/Product.html | 12 +-
.../en/html/api/Bugzilla/WebService/User.html | 32 ++-
docs/en/html/api/index.html | 4 +-
docs/en/html/attachments.html | 4 +-
docs/en/html/bug_page.html | 4 +-
docs/en/html/bug_status_workflow.html | 4 +-
docs/en/html/bugreports.html | 4 +-
docs/en/html/classifications.html | 4 +-
docs/en/html/cmdline-bugmail.html | 4 +-
docs/en/html/cmdline.html | 4 +-
docs/en/html/components.html | 4 +-
docs/en/html/configuration.html | 21 +-
docs/en/html/conventions.html | 6 +-
docs/en/html/copyright.html | 4 +-
docs/en/html/credits.html | 4 +-
docs/en/html/cust-change-permissions.html | 4 +-
docs/en/html/cust-hooks.html | 4 +-
docs/en/html/cust-skins.html | 4 +-
docs/en/html/cust-templates.html | 4 +-
docs/en/html/custom-fields.html | 4 +-
docs/en/html/customization.html | 4 +-
docs/en/html/disclaimer.html | 4 +-
docs/en/html/edit-values.html | 4 +-
docs/en/html/extraconfig.html | 6 +-
docs/en/html/flags-overview.html | 4 +-
docs/en/html/flags.html | 4 +-
docs/en/html/general-advice.html | 4 +-
docs/en/html/gfdl-0.html | 4 +-
docs/en/html/gfdl-1.html | 4 +-
docs/en/html/gfdl-10.html | 4 +-
docs/en/html/gfdl-2.html | 4 +-
docs/en/html/gfdl-3.html | 4 +-
docs/en/html/gfdl-4.html | 4 +-
docs/en/html/gfdl-5.html | 4 +-
docs/en/html/gfdl-6.html | 4 +-
docs/en/html/gfdl-7.html | 4 +-
docs/en/html/gfdl-8.html | 4 +-
docs/en/html/gfdl-9.html | 4 +-
docs/en/html/gfdl-howto.html | 6 +-
docs/en/html/gfdl.html | 6 +-
docs/en/html/glossary.html | 8 +-
docs/en/html/groups.html | 6 +-
docs/en/html/hintsandtips.html | 6 +-
docs/en/html/index.html | 6 +-
docs/en/html/install-perlmodules-manual.html | 4 +-
docs/en/html/installation.html | 66 ++++-
docs/en/html/installing-bugzilla.html | 16 +-
docs/en/html/integration.html | 4 +-
docs/en/html/keywords.html | 4 +-
docs/en/html/lifecycle.html | 4 +-
docs/en/html/milestones.html | 4 +-
docs/en/html/modules-manual-download.html | 4 +-
docs/en/html/modules-manual-instructions.html | 4 +-
docs/en/html/modules-manual-optional.html | 4 +-
docs/en/html/multiple-bz-dbs.html | 4 +-
docs/en/html/myaccount.html | 4 +-
docs/en/html/newversions.html | 120 +-------
docs/en/html/nonroot.html | 24 +-
docs/en/html/os-specific.html | 4 +-
docs/en/html/parameters.html | 4 +-
docs/en/html/paranoid-security.html | 4 +-
docs/en/html/patches.html | 4 +-
docs/en/html/products.html | 4 +-
docs/en/html/query.html | 20 +-
docs/en/html/quips.html | 4 +-
docs/en/html/reporting.html | 6 +-
docs/en/html/sanitycheck.html | 4 +-
docs/en/html/security-bugzilla.html | 4 +-
docs/en/html/security-os.html | 4 +-
docs/en/html/security-webserver.html | 4 +-
docs/en/html/security.html | 4 +-
docs/en/html/timetracking.html | 4 +-
docs/en/html/trbl-dbdsponge.html | 4 +-
docs/en/html/trbl-index.html | 4 +-
docs/en/html/trbl-passwd-encryption.html | 4 +-
docs/en/html/trbl-perlmodule.html | 4 +-
docs/en/html/trbl-relogin-everyone.html | 8 +-
docs/en/html/trbl-relogin-some.html | 4 +-
docs/en/html/trbl-testserver.html | 4 +-
docs/en/html/troubleshooting.html | 4 +-
docs/en/html/upgrade.html | 4 +-
docs/en/html/useradmin.html | 4 +-
docs/en/html/userpreferences.html | 4 +-
docs/en/html/using-intro.html | 4 +-
docs/en/html/using.html | 8 +-
docs/en/html/versions.html | 4 +-
docs/en/html/voting.html | 4 +-
docs/en/html/whining.html | 6 +-
docs/en/txt/Bugzilla-Guide.txt | 82 +++---
docs/en/xml/Bugzilla-Guide.xml | 4 +-
docs/en/xml/about.xml | 42 +--
docs/en/xml/installation.xml | 78 ++++--
docs/en/xml/security.xml | 1 -
docs/en/xml/troubleshooting.xml | 1 -
enter_bug.cgi | 9 +-
js/field.js | 42 ++-
template/en/default/admin/admin.html.tmpl | 2 +-
template/en/default/bug/edit.html.tmpl | 4 +-
.../en/default/global/code-error.html.tmpl | 3 +
.../global/confirm-user-match.html.tmpl | 10 +-
template/en/default/list/list.atom.tmpl | 6 +-
template/en/default/list/list.html.tmpl | 5 +-
template/en/default/pages/fields.html.tmpl | 2 +-
.../en/default/pages/release-notes.html.tmpl | 74 ++++-
template/en/default/reports/menu.html.tmpl | 3 +
131 files changed, 1062 insertions(+), 789 deletions(-)
diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index 7dcaf3a2b..f22e31933 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -163,6 +163,8 @@ use File::Basename;
PASSWORD_DIGEST_ALGORITHM
PASSWORD_SALT_LENGTH
+
+ CGI_URI_LIMIT
);
@Bugzilla::Constants::EXPORT_OK = qw(contenttypes);
@@ -170,7 +172,7 @@ use File::Basename;
# CONSTANTS
#
# Bugzilla version
-use constant BUGZILLA_VERSION => "3.4.5";
+use constant BUGZILLA_VERSION => "3.4.6";
# These are unique values that are unlikely to match a string or a number,
# to be used in criteria for match() functions and other things. They start
@@ -466,6 +468,11 @@ use constant PASSWORD_DIGEST_ALGORITHM => 'SHA-256';
# of your users will be able to log in until they reset their passwords.
use constant PASSWORD_SALT_LENGTH => 8;
+# Certain scripts redirect to GET even if the form was submitted originally
+# via POST such as buglist.cgi. This value determines whether the redirect
+# can be safely done or not based on the web server's URI length setting.
+use constant CGI_URI_LIMIT => 8000;
+
sub bz_locations {
# We know that Bugzilla/Constants.pm must be in %INC at this point.
# So the only question is, what's the name of the directory
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index cfd3c86fd..bef914249 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -761,6 +761,7 @@ sub get_selectable_classifications {
sub can_enter_product {
my ($self, $product_name, $warn) = @_;
my $dbh = Bugzilla->dbh;
+ $warn ||= 0;
if (!defined($product_name)) {
return unless $warn == THROW_ERROR;
@@ -1116,6 +1117,7 @@ sub match {
my $wildstr = $str;
if ($wildstr =~ s/\*/\%/g # don't do wildcards if no '*' in the string
+ && $user->id
# or if we only want exact matches
&& Bugzilla->params->{'usermatchmode'} ne 'off')
{
@@ -1158,6 +1160,7 @@ sub match {
# then try substring search
if ((scalar(@users) == 0)
+ && $user->id
&& (Bugzilla->params->{'usermatchmode'} eq 'search')
&& (length($str) >= 3))
{
diff --git a/Bugzilla/WebService/Constants.pm b/Bugzilla/WebService/Constants.pm
index e47beb1f2..4ecb20095 100644
--- a/Bugzilla/WebService/Constants.pm
+++ b/Bugzilla/WebService/Constants.pm
@@ -112,6 +112,8 @@ use constant WS_ERROR_CODE => {
invalid_user_group => 504,
user_access_by_id_denied => 505,
user_access_by_match_denied => 505,
+ # Fatal errors (must be negative).
+ unknown_method => -32601,
};
# These are the fallback defaults for errors not in ERROR_CODE.
diff --git a/Bugzilla/WebService/Server.pm b/Bugzilla/WebService/Server.pm
index dfb9f559a..ffc54c612 100644
--- a/Bugzilla/WebService/Server.pm
+++ b/Bugzilla/WebService/Server.pm
@@ -18,10 +18,12 @@
package Bugzilla::WebService::Server;
use strict;
use Bugzilla::Util qw(ssl_require_redirect);
+use Bugzilla::Error;
sub handle_login {
my ($self, $class, $method, $full_method) = @_;
eval "require $class";
+ ThrowCodeError('unknown_method', {method => $full_method}) if $@;
return if $class->login_exempt($method);
Bugzilla->login();
diff --git a/buglist.cgi b/buglist.cgi
index 493344004..d1e1c9b15 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -85,9 +85,11 @@ if (grep { $_ =~ /^cmd\-/ } $cgi->param()) {
#
if ($cgi->request_method() eq 'POST') {
$cgi->clean_search_url();
-
- print $cgi->redirect(-url => $cgi->self_url());
- exit;
+ my $uri_length = length($cgi->self_url());
+ if ($uri_length < CGI_URI_LIMIT) {
+ print $cgi->redirect(-url => $cgi->self_url());
+ exit;
+ }
}
# Determine whether this is a quicksearch query.
@@ -730,9 +732,11 @@ if ($format->{'extension'} eq 'atom') {
'short_desc',
'opendate',
'changeddate',
+ 'reporter',
'reporter_realname',
'priority',
'bug_severity',
+ 'assigned_to',
'assigned_to_realname',
'bug_status',
'product',
diff --git a/contrib/bugzilla_ldapsync.rb b/contrib/bugzilla_ldapsync.rb
index 4fca2a7da..579f56fc5 100755
--- a/contrib/bugzilla_ldapsync.rb
+++ b/contrib/bugzilla_ldapsync.rb
@@ -4,8 +4,6 @@
# and makes nice bugzilla user entries out of them. Also disables Bugzilla users
# that are not found in LDAP.
-# $Id: bugzilla_ldapsync.rb,v 1.2 2003/04/26 16:35:04 jake%bugzilla.org Exp $
-
require 'ldap'
require 'dbi'
require 'getoptlong'
diff --git a/contrib/sendbugmail.pl b/contrib/sendbugmail.pl
index 4fd1c8374..f4bebabc6 100644
--- a/contrib/sendbugmail.pl
+++ b/contrib/sendbugmail.pl
@@ -4,8 +4,6 @@
#
# Nick Barnes, Ravenbrook Limited, 2004-04-01.
#
-# $Id: sendbugmail.pl,v 1.8 2007/10/19 06:46:17 mkanat%bugzilla.org Exp $
-#
# Bugzilla email script for Bugzilla 2.17.4 and later. Invoke this to send
# bugmail for a bug which has been changed directly in the database.
# This uses Bugzilla's own BugMail facility, and will email the
diff --git a/contrib/yp_nomail.sh b/contrib/yp_nomail.sh
index 36bbc82f7..9d23d5e33 100644
--- a/contrib/yp_nomail.sh
+++ b/contrib/yp_nomail.sh
@@ -1,7 +1,6 @@
#!/bin/sh
# -*- Mode: ksh -*-
##############################################################################
-# $Id: yp_nomail.sh,v 1.1 2000/09/12 23:50:31 cyeh%bluemartini.com Exp $
# yp_nomail
#
# Our mail admins got annoyed when bugzilla kept sending email
diff --git a/docs/en/html/Bugzilla-Guide.html b/docs/en/html/Bugzilla-Guide.html
index f2d729c38..e8d920a18 100644
--- a/docs/en/html/Bugzilla-Guide.html
+++ b/docs/en/html/Bugzilla-Guide.html
@@ -2,7 +2,7 @@
The Bugzilla Guide - 3.4.5
+>The Bugzilla Guide - 3.4.6
ReleaseThe Bugzilla Guide - 3.4.5
+>The Bugzilla Guide - 3.4.6
Release
The Bugzilla Team
2010-01-31
2010-03-07
1.3. New Versions
This is the 3.4.5 version of The Bugzilla Guide. It is so named
+>
This is the 3.4.6 version of The Bugzilla Guide. It is so named
to match the current version of Bugzilla.
The latest version of this guide can always be found at http://www.bugzilla.org, or checked out via CVS by
- following the Mozilla
- CVS instructions and check out the
- mozilla/webtools/bugzilla/docs/
- subtree. However, you should read the version
- which came with the Bugzilla release you are using.
-
The Bugzilla Guide, or a section of it, is also available in
- the following languages:
- French,
- German,
- Japanese.
- Note that these may be outdated or not up to date.
+>http://www.bugzilla.org/docs/. However, you should read
+ the version which came with the Bugzilla release you are using.
- If you would like to volunteer to translate the Guide into additional
- languages, please contact
+ They may have translated documentation available. If you would like to
+ volunteer to translate the Guide into additional languages, please visit the
Dave Miller.
+>Bugzilla L10n team
+ page.
Template::Plugin::GD::Image
- (1.20) for Graphical Reports
+ (any) for Graphical Reports
Authen::SASL
+ (any) for SASL Authentication
+
Authen::Radius
(any) for RADIUS Authentication
TheSchwartz
+ (any) for Mail Queueing
+
Daemon::Generic
+ (any) for Mail Queueing
+
mod_perl2
(1.999022) for mod_perl
checksetup.pl run. You should go through
- the parameters on the Edit Parameters page
- (see link in the footer) and see if there are any you wish to
- change.
+ the Parameters page and see if there are any you wish to change.
They key parameters are documented in Section 3.1.
This would also be a good time to revisit the
- localconfig file and make sure that the
- names of the priorities, severities, platforms and operating systems
- are those you wish to use when you start creating bugs. Remember
- to rerun checksetup.pl if you change it.
-
Bugzilla has several optional features which require extra
configuration. You can read about those in
undef if there is no currently logged in user, the currently logged in user is not in the sudoer group, or there is no session in progress. If an sudo session is in progress, returns the Bugzilla::User object corresponding to the person who logged in and initiated the session. If no session is in progress, returns the Bugzilla::User object corresponding to the currently logged in user.
Creates an empty database with the name $db_name, if that database doesn't already exist. Prints an error message and exits if we can't create the database.
For an upgrade or an initial installation, populates the tables that hold the legal values for the old "enum" fields: bug_severity, resolution, etc. Prints out information if it inserts anything into the DB.
diff --git a/docs/en/html/api/Bugzilla/Object.html b/docs/en/html/api/Bugzilla/Object.html
index bf4cf1b07..d19035ddb 100644
--- a/docs/en/html/api/Bugzilla/Object.html
+++ b/docs/en/html/api/Bugzilla/Object.html
@@ -393,7 +393,9 @@ name="Database_Manipulation"
>"UPDATE_COLUMNS" will be updated, and they will only be updated if their values have changed.
Note: This doesn't check whether or not the current user can add/remove bugs to/from these groups. It just tells you that bugs could be in these groups, in this product.
diff --git a/docs/en/html/api/Bugzilla/WebService/Bug.html b/docs/en/html/api/Bugzilla/WebService/Bug.html
index 26b79d708..258615724 100644
--- a/docs/en/html/api/Bugzilla/WebService/Bug.html
+++ b/docs/en/html/api/Bugzilla/WebService/Bug.html
@@ -75,7 +75,9 @@ name="Utility_Functions"
>field - The name of the field you want information about.
This should be the same as the name you would use in "create",
-below.
+below.
+
+
checksetup.pl run. You should go through
- the parameters on the Edit Parameters page
- (see link in the footer) and see if there are any you wish to
- change.
+ the Parameters page and see if there are any you wish to change.
They key parameters are documented in Section 3.1.
This would also be a good time to revisit the
- localconfig file and make sure that the
- names of the priorities, severities, platforms and operating systems
- are those you wish to use when you start creating bugs. Remember
- to rerun checksetup.pl if you change it.
-
Bugzilla has several optional features which require extra
configuration. You can read about those in
This is the 3.4.5 version of The Bugzilla Guide. It is so named
+>
This is the 3.4.6 version of The Bugzilla Guide. It is so named
to match the current version of Bugzilla.
The latest version of this guide can always be found at http://www.bugzilla.org, or checked out via CVS by
- following the Mozilla
- CVS instructions and check out the
- mozilla/webtools/bugzilla/docs/
- subtree. However, you should read the version
- which came with the Bugzilla release you are using.
-
The Bugzilla Guide, or a section of it, is also available in
- the following languages:
- French,
- German,
- Japanese.
- Note that these may be outdated or not up to date.
+>http://www.bugzilla.org/docs/. However, you should read
+ the version which came with the Bugzilla release you are using.
- If you would like to volunteer to translate the Guide into additional
- languages, please contact
+ They may have translated documentation available. If you would like to
+ volunteer to translate the Guide into additional languages, please visit the
Dave Miller.
+>Bugzilla L10n team
+ page.
-
+
-
+
diff --git a/docs/en/xml/about.xml b/docs/en/xml/about.xml
index 7372a44ac..0de584013 100644
--- a/docs/en/xml/about.xml
+++ b/docs/en/xml/about.xml
@@ -1,6 +1,5 @@
-
About This Guide
@@ -68,44 +67,17 @@
The latest version of this guide can always be found at , or checked out via CVS by
- following the Mozilla
- CVS instructions and check out the
- mozilla/webtools/bugzilla/docs/
- subtree. However, you should read the version
- which came with the Bugzilla release you are using.
-
-
- The Bugzilla Guide, or a section of it, is also available in
- the following languages:
- French,
- German,
- Japanese.
- Note that these may be outdated or not up to date.
+ url="http://www.bugzilla.org/docs/"/>. However, you should read
+ the version which came with the Bugzilla release you are using.
In addition, there are Bugzilla template localization projects in
- the following languages. They may have translated documentation
- available:
- Arabic,
- Belarusian,
- Bulgarian,
- Brazilian Portuguese,
- Chinese,
- French,
- German,
- Italian,
- Japanese,
- Korean,
- Russian and
- Spanish.
-
-
-
- If you would like to volunteer to translate the Guide into additional
- languages, please contact
- Dave Miller.
+ several languages.
+ They may have translated documentation available. If you would like to
+ volunteer to translate the Guide into additional languages, please visit the
+ Bugzilla L10n team
+ page.
diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index 27d4823b4..5ebed6144 100644
--- a/docs/en/xml/installation.xml
+++ b/docs/en/xml/installation.xml
@@ -1,5 +1,4 @@
-
Installing Bugzilla
@@ -285,7 +284,7 @@
- CGI &min-cgi-ver;
+ CGI (&min-cgi-ver;)
@@ -295,6 +294,18 @@
+
+
+ DateTime (&min-datetime-ver;)
+
+
+
+
+
+ DateTime::TimeZone (&min-datetime-timezone-ver;)
+
+
+
DBI (&min-dbi-ver;)
@@ -322,8 +333,7 @@
- Template
- (&min-template-ver;)
+ Digest::SHA (&min-digest-sha-ver;)
@@ -333,11 +343,36 @@
+
+
+ Email::MIME (&min-email-mime-ver;)
+
+
+
+
+
+ Email::MIME::Encodings (&min-email-mime-encodings-ver;)
+
+
+
Email::MIME::Modifier (&min-email-mime-modifier-ver;)
+
+
+
+ Template
+ (&min-template-ver;)
+
+
+
+
+
+ URI (&min-uri-ver;)
+
+
Optional Perl modules:
@@ -352,7 +387,7 @@
Template::Plugin::GD::Image
- (&min-gd-ver;) for Graphical Reports
+ (&min-template-plugin-gd-image-ver;) for Graphical Reports
@@ -417,6 +452,13 @@
+
+
+ Authen::SASL
+ (&min-authen-sasl-ver;) for SASL Authentication
+
+
+
Authen::Radius
@@ -459,6 +501,20 @@
+
+
+ TheSchwartz
+ (&min-theschwartz-ver;) for Mail Queueing
+
+
+
+
+
+ Daemon::Generic
+ (&min-daemon-generic-ver;) for Mail Queueing
+
+
+
mod_perl2
@@ -1367,9 +1423,7 @@ c:\perl\bin\perl.exe -xc:\bugzilla -wT "%s" %s
Log in with the administrator account you defined in the last
checksetup.pl run. You should go through
- the parameters on the Edit Parameters page
- (see link in the footer) and see if there are any you wish to
- change.
+ the Parameters page and see if there are any you wish to change.
They key parameters are documented in ;
you should certainly alter
maintainer and urlbase;
@@ -1377,14 +1431,6 @@ c:\perl\bin\perl.exe -xc:\bugzilla -wT "%s" %s
cookiepath or requirelogin.
-
- This would also be a good time to revisit the
- localconfig file and make sure that the
- names of the priorities, severities, platforms and operating systems
- are those you wish to use when you start creating bugs. Remember
- to rerun checksetup.pl if you change it.
-
-
Bugzilla has several optional features which require extra
configuration. You can read about those in
diff --git a/docs/en/xml/security.xml b/docs/en/xml/security.xml
index 1b3a7704b..b234dd993 100644
--- a/docs/en/xml/security.xml
+++ b/docs/en/xml/security.xml
@@ -1,5 +1,4 @@
-
Bugzilla Security
diff --git a/docs/en/xml/troubleshooting.xml b/docs/en/xml/troubleshooting.xml
index 223c8a135..60656a936 100644
--- a/docs/en/xml/troubleshooting.xml
+++ b/docs/en/xml/troubleshooting.xml
@@ -1,5 +1,4 @@
-
Troubleshooting
diff --git a/enter_bug.cgi b/enter_bug.cgi
index be625856e..a6006c0a1 100755
--- a/enter_bug.cgi
+++ b/enter_bug.cgi
@@ -407,7 +407,14 @@ $vars->{'token'} = issue_session_token('createbug:');
my @enter_bug_fields = grep { $_->enter_bug } Bugzilla->active_custom_fields;
foreach my $field (@enter_bug_fields) {
- $vars->{$field->name} = formvalue($field->name);
+ my $cf_name = $field->name;
+ my $cf_value = $cgi->param($cf_name);
+ if (defined $cf_value) {
+ if ($field->type == FIELD_TYPE_MULTI_SELECT) {
+ $cf_value = [$cgi->param($cf_name)];
+ }
+ $default{$cf_name} = $vars->{$cf_name} = $cf_value;
+ }
}
# This allows the Field visibility and value controls to work with the
diff --git a/js/field.js b/js/field.js
index 700c1de8d..62ca7e450 100644
--- a/js/field.js
+++ b/js/field.js
@@ -267,6 +267,16 @@ function showHideStatusItems(e, dupArrayInfo) {
// finish doing stuff based on the selection.
if ( el ) {
showDuplicateItem(el);
+
+ // Make sure that fields whose visibility or values are controlled
+ // by "resolution" behave properly when resolution is hidden.
+ var resolution = document.getElementById('resolution');
+ if (resolution && resolution.options[0].value != '') {
+ resolution.bz_lastSelected = resolution.selectedIndex;
+ var emptyOption = new Option('', '');
+ resolution.insertBefore(emptyOption, resolution.options[0]);
+ emptyOption.selected = true;
+ }
YAHOO.util.Dom.addClass('resolution_settings', 'bz_default_hidden');
if (document.getElementById('resolution_settings_warning')) {
YAHOO.util.Dom.addClass('resolution_settings_warning',
@@ -274,18 +284,24 @@ function showHideStatusItems(e, dupArrayInfo) {
}
YAHOO.util.Dom.addClass('duplicate_display', 'bz_default_hidden');
- if ( el.value == dupArrayInfo[1] && dupArrayInfo[0] == "is_duplicate" ) {
+
+ if ( (el.value == dupArrayInfo[1] && dupArrayInfo[0] == "is_duplicate")
+ || bz_isValueInArray(close_status_array, el.value) )
+ {
YAHOO.util.Dom.removeClass('resolution_settings',
'bz_default_hidden');
YAHOO.util.Dom.removeClass('resolution_settings_warning',
- 'bz_default_hidden');
+ 'bz_default_hidden');
+
+ // Remove the blank option we inserted.
+ if (resolution && resolution.options[0].value == '') {
+ resolution.removeChild(resolution.options[0]);
+ resolution.selectedIndex = resolution.bz_lastSelected;
+ }
}
- else if ( bz_isValueInArray(close_status_array, el.value) ) {
- // hide duplicate and show resolution
- YAHOO.util.Dom.removeClass('resolution_settings',
- 'bz_default_hidden');
- YAHOO.util.Dom.removeClass('resolution_settings_warning',
- 'bz_default_hidden');
+
+ if (resolution) {
+ bz_fireEvent(resolution, 'change');
}
}
}
@@ -300,8 +316,11 @@ function showDuplicateItem(e) {
YAHOO.util.Dom.removeClass('duplicate_settings',
'bz_default_hidden');
YAHOO.util.Dom.addClass('dup_id_discoverable', 'bz_default_hidden');
- dup_id.focus();
- dup_id.select();
+ // check to make sure the field is visible or IE throws errors
+ if( ! YAHOO.util.Dom.hasClass( dup_id, 'bz_default_hidden' ) ){
+ dup_id.focus();
+ dup_id.select();
+ }
}
else {
YAHOO.util.Dom.addClass('duplicate_settings', 'bz_default_hidden');
@@ -318,8 +337,9 @@ function setResolutionToDuplicate(e, duplicate_or_move_bug_status) {
var resolution = document.getElementById('resolution');
YAHOO.util.Dom.addClass('dup_id_discoverable', 'bz_default_hidden');
status.value = duplicate_or_move_bug_status;
+ bz_fireEvent(status, 'change');
resolution.value = "DUPLICATE";
- showHideStatusItems("", ["",""]);
+ bz_fireEvent(resolution, 'change');
YAHOO.util.Event.preventDefault(e);
}
diff --git a/template/en/default/admin/admin.html.tmpl b/template/en/default/admin/admin.html.tmpl
index 17fd0d017..9b5325081 100644
--- a/template/en/default/admin/admin.html.tmpl
+++ b/template/en/default/admin/admin.html.tmpl
@@ -26,7 +26,7 @@
%]
- This page is only accessible to empowered users. You can access administrive pages
+ This page is only accessible to empowered users. You can access administrative pages
from here (based on your privileges), letting you configure different aspects of
this installation. Note: some sections may not be accessible to you and are marked
using a lighter color.
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index b6175f29c..ff3211542 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -391,8 +391,8 @@ document.changeform = document.[% cfname %];
[% PROCESS commit_button id="_top" nobr=1 %]
- [% terms.Bug %] [% bug.bug_id FILTER html %] -
-
+ [%-# %][% terms.Bug %] [% bug.bug_id FILTER html %]
+ [%-# %] -
[% IF Param("usebugaliases") %]
[% IF bug.alias != "" %]
([% bug.alias FILTER html %])
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index d2eac81bb..e0f247b5d 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -451,6 +451,9 @@
I could not figure out what you wanted to do.
[% END %]
+ [% ELSIF error == "unknown_method" %]
+ The requested method '[% method FILTER html %]' was not found.
+
[% ELSIF error == "usage_mode_invalid" %]
'[% invalid_usage_mode FILTER html %]' is not a valid usage mode.
diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index 5b209dfce..52607614c 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -41,7 +41,7 @@
[% IF matchsuccess == 1 %]
[% PROCESS global/header.html.tmpl title="Confirm Match" %]
-[% USE Bugzilla %]
+ [% USE Bugzilla %]