? Bugzilla/bugzilla-patch-57350-v4 ? skins/custom/gentoo-header.png Index: buglist.cgi =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/buglist.cgi,v retrieving revision 1.325 diff -u -3 -p -w -b -B -u -a -w -b -B -r1.325 buglist.cgi --- buglist.cgi 21 Feb 2006 00:05:56 -0000 1.325 +++ buglist.cgi 11 Jan 2007 19:07:02 -0000 @@ -852,16 +852,17 @@ my $search = new Bugzilla::Search('field 'order' => \@orderstrings); my $query = $search->getSQL(); -if (defined $cgi->param('limit')) { - my $limit = $cgi->param('limit'); +# <> - Respect user limit if under 5000; If no limit specified use 5000. +if ($fulltext) { + $query .= " " . $dbh->sql_limit(FULLTEXT_BUGLIST_LIMIT); + $vars->{'sorted_by_relevance'} = 1; +} +else { + my $limit = (defined($cgi->param('limit')) && $cgi->param('limit') <= 5000) ? $cgi->param('limit') : 5000; if (detaint_natural($limit)) { $query .= " " . $dbh->sql_limit($limit); } } -elsif ($fulltext) { - $query .= " " . $dbh->sql_limit(FULLTEXT_BUGLIST_LIMIT); - $vars->{'sorted_by_relevance'} = 1; -} ################################################################################ Index: show_bug.cgi =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/show_bug.cgi,v retrieving revision 1.38 diff -u -3 -p -w -b -B -u -a -w -b -B -r1.38 show_bug.cgi --- show_bug.cgi 30 Oct 2005 21:31:28 -0000 1.38 +++ show_bug.cgi 11 Jan 2007 19:07:02 -0000 @@ -80,9 +80,12 @@ if ($single) { } } } else { + # <> - limit this + my $count = 0; foreach my $id ($cgi->param('id')) { my $bug = new Bugzilla::Bug($id, Bugzilla->user->id); push @bugs, $bug; + last if ++$count == 100; } } Index: Bugzilla/Bug.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Bug.pm,v retrieving revision 1.104.2.2 diff -u -3 -p -w -b -B -u -a -w -b -B -r1.104.2.2 Bug.pm --- Bugzilla/Bug.pm 12 Apr 2006 22:57:53 -0000 1.104.2.2 +++ Bugzilla/Bug.pm 11 Jan 2007 19:07:02 -0000 @@ -65,8 +65,8 @@ use base qw(Exporter); use constant MAX_LINE_LENGTH => 254; # Used in ValidateComment(). Gives the max length allowed for a comment. -use constant MAX_COMMENT_LENGTH => 65535; - +# jsf use constant MAX_COMMENT_LENGTH => 65535; +use constant MAX_COMMENT_LENGTH => 8000; ##################################################################### sub fields { Index: Bugzilla/BugMail.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm,v retrieving revision 1.62 diff -u -3 -p -w -b -B -u -a -w -b -B -r1.62 BugMail.pm --- Bugzilla/BugMail.pm 7 Jan 2006 16:16:53 -0000 1.62 +++ Bugzilla/BugMail.pm 11 Jan 2007 19:07:02 -0000 @@ -297,10 +297,12 @@ sub ProcessOneBug { } $lastbug = $depbug; my $urlbase = Param("urlbase"); + my $sslbase = Param("sslbase"); $thisdiff = "\nBug $id depends on bug $depbug, which changed state.\n\n" . "Bug $depbug Summary: $summary\n" . - "${urlbase}show_bug.cgi?id=$depbug\n\n"; + "Clear-Text: ${urlbase}show_bug.cgi?id=$depbug\n". + "Secure: ${sslbase}show_bug.cgi?id=$depbug\n\n"; $thisdiff .= FormatTriple("What ", "Old Value", "New Value"); $thisdiff .= ('-' x 76) . "\n"; $interestingchange = 0; @@ -607,6 +609,8 @@ sub sendMail { $substs{"keywords"} = $values{'keywords'}; $substs{"severity"} = $values{'bug_severity'}; $substs{"summary"} = $values{'short_desc'}; + $substs{"resolution"} = $values{'resolution'}; + $substs{"status"} = $values{'bug_status'}; $substs{"reasonsheader"} = join(" ", map { $rel_names{$_} } @$relRef); $substs{"reasonsbody"} = $reasonsbody; $substs{"space"} = " "; Index: Bugzilla/DB.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/DB.pm,v retrieving revision 1.71 diff -u -3 -p -w -b -B -u -a -w -b -B -r1.71 DB.pm --- Bugzilla/DB.pm 5 Jan 2006 00:16:20 -0000 1.71 +++ Bugzilla/DB.pm 11 Jan 2007 19:07:02 -0000 @@ -161,9 +161,22 @@ sub connect_main { $db_sock, $db_user, $db_pass); } +# robbat2 09-Nov-2006 +sub _randomize_host { + my ($hostnames) = @_; + + my @hosts = split(/,/,$hostnames); + # We randomize between hosts evenly. If there is only one, well that gets + # returned ;-) + return $hosts[rand(scalar(@hosts))]; +} + sub _connect { my ($driver, $host, $dbname, $port, $sock, $user, $pass) = @_; + # robbat2 09-Nov-2006 + $host = _randomize_host($host); + # DB specific module have the same name as DB driver, here we # just make sure we are not case sensitive (my $db_module = $driver) =~ s/(\w+)/\u\L$1/g; @@ -919,6 +932,19 @@ sub _bz_store_real_schema { $sth->execute(); } +sub _update_longdescs_who_index { + my $dbh = Bugzilla->dbh; + # When doing a search on who posted a comment, longdescs is joined + # against the bugs table. So we need an index on both of these, + # not just on "who". + my $who_index = $dbh->bz_index_info('longdescs', 'longdescs_who_idx'); + if (!$who_index || scalar @{$who_index->{FIELDS}} == 1) { + # If the index doesn't exist, this will harmlessly do nothing. + $dbh->bz_drop_index('longdescs', 'longdescs_who_idx'); + $dbh->bz_add_index('longdescs', 'longdescs_who_idx', [qw(who bug_id)]); + } +} + 1; __END__ Index: Bugzilla/Search.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Search.pm,v retrieving revision 1.121.2.1 diff -u -3 -p -w -b -B -u -a -w -b -B -r1.121.2.1 Search.pm Index: Bugzilla/Search/Quicksearch.pm =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Search/Quicksearch.pm,v retrieving revision 1.2 diff -u -3 -p -w -b -B -u -a -w -b -B -r1.2 Quicksearch.pm --- Bugzilla/Search/Quicksearch.pm 26 Aug 2005 23:11:31 -0000 1.2 +++ Bugzilla/Search/Quicksearch.pm 11 Jan 2007 19:07:02 -0000 @@ -130,7 +130,8 @@ sub quicksearch { else { # It's not just a bug number or a list of bug numbers. # Maybe it's an alias? - if ($searchstring =~ /^([^,\s]+)$/) { + # Upstream just used to search directly, but at Gentoo we want the prefix ALIAS + if ($searchstring =~ /^ALIAS\s+([^,\s]+)$/) { if (Bugzilla->dbh->selectrow_array(q{SELECT COUNT(*) FROM bugs WHERE alias = ?}, Index: template/en/custom/index.html.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/index.html.tmpl,v retrieving revision 1.24 diff -u -3 -p -w -b -B -u -a -w -b -B -r1.24 index.html.tmpl --- template/en/custom/index.html.tmpl 21 Aug 2005 18:16:42 -0000 1.24 +++ template/en/custom/index.html.tmpl 11 Jan 2007 19:07:02 -0000 @@ -60,12 +60,43 @@ function addSidebar() {
-

This is where we put in lots of nifty words explaining all about [% terms.Bugzilla %].

+

Welcome to the Gentoo Bug tracking system.

+
-

But it all boils down to a choice of:

+
+
+

Enter [% terms.abug %] # or some search terms:

+ + + [Help] +
When searching for duplicate bugs or using multiple search terms, prefix your entry with 'ALL' (not suffix)
+
+
+
+ + +

You can choose from the below options as well:

-
-
-

Enter [% terms.abug %] # or some search terms:

- - - [Help] -
-
Index: template/en/custom/account/auth/login-small.html.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/account/auth/login-small.html.tmpl,v retrieving revision 1.2 diff -u -3 -p -w -b -B -u -a -w -b -B -r1.2 login-small.html.tmpl --- template/en/custom/account/auth/login-small.html.tmpl 21 Feb 2006 00:19:25 -0000 1.2 +++ template/en/custom/account/auth/login-small.html.tmpl 11 Jan 2007 19:07:02 -0000 @@ -28,15 +28,15 @@ [%# If SSL is in use, use 'sslbase', else use 'urlbase'. %] [% IF Param("sslbase") != "" && Param("ssl") != "never" %] - [% script_name = Param("sslbase") _ script_name %] + [%# script_name = Param("sslbase") _ script_name %] [% ELSE %] - [% script_name = Param("urlbase") _ script_name %] + [%# script_name = Param("urlbase") _ script_name %] [% END %]
- + Index: template/en/custom/account/auth/login.html.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/account/auth/login.html.tmpl,v retrieving revision 1.13 diff -u -3 -p -w -b -B -u -a -w -b -B -r1.13 login.html.tmpl --- template/en/custom/account/auth/login.html.tmpl 12 Apr 2005 17:23:01 -0000 1.13 +++ template/en/custom/account/auth/login.html.tmpl 11 Jan 2007 19:07:02 -0000 @@ -40,7 +40,7 @@
Login:Login (email):
Index: template/en/custom/bug/edit.html.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/bug/edit.html.tmpl,v retrieving revision 1.69.2.2 diff -u -3 -p -w -b -B -u -a -w -b -B -r1.69.2.2 edit.html.tmpl --- template/en/custom/bug/edit.html.tmpl 3 Mar 2006 00:07:41 -0000 1.69.2.2 +++ template/en/custom/bug/edit.html.tmpl 11 Jan 2007 19:07:02 -0000 @@ -25,6 +25,24 @@ [% PROCESS "global/field-descs.none.tmpl" %] [% PROCESS bug/time.html.tmpl %] + + + + +[% IF (matches = user.login.match('gentoo.org$')) %] + + + +[% END %] + + + [% IF UserInGroup(Param('timetrackinggroup')) %] @@ -365,6 +408,8 @@ function set_assign_to() { [% END %] + +[% IF (matches = user.login.match('gentoo.org$')) %] + +[% END %] + [%# Form controls for entering additional data about the bug being created. %] [% Hook.process("form") %] Index: template/en/custom/global/banner.html.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/global/banner.html.tmpl,v retrieving revision 1.8 diff -u -3 -p -w -b -B -u -a -w -b -B -r1.8 banner.html.tmpl --- template/en/custom/global/banner.html.tmpl 22 Jun 2004 21:07:38 -0000 1.8 +++ template/en/custom/global/banner.html.tmpl 11 Jan 2007 19:07:02 -0000 @@ -28,11 +28,24 @@ Index: template/en/custom/global/field-descs.none.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/global/field-descs.none.tmpl,v retrieving revision 1.12 diff -u -3 -p -w -b -B -u -a -w -b -B -r1.12 field-descs.none.tmpl --- template/en/custom/global/field-descs.none.tmpl 11 Aug 2005 06:19:24 -0000 1.12 +++ template/en/custom/global/field-descs.none.tmpl 11 Jan 2007 19:07:02 -0000 @@ -85,6 +85,10 @@ "DUPLICATE" => "DUPLICATE", "WORKSFORME" => "WORKSFORME", "MOVED" => "MOVED", + "CANTFIX" => "CANTFIX", + "NEEDINFO" => "NEEDINFO", + "TEST-REQUEST" => "TEST-REQUEST", + "UPSTREAM" => "UPSTREAM", "---" => "---", " " => " " } %] Index: template/en/custom/global/header.html.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/global/header.html.tmpl,v retrieving revision 1.40 diff -u -3 -p -w -b -B -u -a -w -b -B -r1.40 header.html.tmpl --- template/en/custom/global/header.html.tmpl 21 Feb 2006 00:05:58 -0000 1.40 +++ template/en/custom/global/header.html.tmpl 11 Jan 2007 19:07:02 -0000 @@ -61,7 +61,7 @@ "http://www.w3.org/TR/html4/loose.dtd"> - [% title FILTER html %] + Gentoo [% title FILTER html %] [%# Migration note: contents of the old Param 'headerhtml' would go here %] @@ -84,6 +84,11 @@ + + + + + [% IF style %]
- Login: + Login (email): Index: template/en/custom/attachment/create.html.tmpl =================================================================== RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/attachment/create.html.tmpl,v retrieving revision 1.22.2.3 diff -u -3 -p -w -b -B -u -a -w -b -B -r1.22.2.3 create.html.tmpl --- template/en/custom/attachment/create.html.tmpl 8 Mar 2006 22:18:42 -0000 1.22.2.3 +++ template/en/custom/attachment/create.html.tmpl 11 Jan 2007 19:07:02 -0000 @@ -167,11 +167,12 @@

Otherwise, choose a method for determining the content type.
+ + name="contenttypemethod" value="list" checked="checked">

Changes to attachment [% attachid %] - of [% terms.bug %] [%+ bugid %] submitted + of [% terms.bug %] [%+ bugid %] submitted

[% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
+ +
Estimated Hours:
@@ -393,6 +438,9 @@ function set_assign_to() {