Merged BugsSite to Bugzilla-3.0.3
Nothing to see here. Move along.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@45519 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/BugsSite/showdependencytree.cgi b/BugsSite/showdependencytree.cgi
index 76ef0dd..1010adc 100755
--- a/BugsSite/showdependencytree.cgi
+++ b/BugsSite/showdependencytree.cgi
@@ -22,26 +22,26 @@
# Andreas Franke <afranke@mathweb.org>
# Christian Reis <kiko@async.com.br>
# Myk Melez <myk@mozilla.org>
+# Frédéric Buclin <LpSolit@gmail.com>
use strict;
use lib qw(.);
-require "CGI.pl";
-use Bugzilla::User;
-# Use global template variables.
-use vars qw($template $vars);
+use Bugzilla;
+use Bugzilla::Error;
+use Bugzilla::Bug;
-Bugzilla->login();
+use List::Util qw(max);
+
+my $user = Bugzilla->login();
my $cgi = Bugzilla->cgi;
-
+my $template = Bugzilla->template;
+my $vars = {};
# Connect to the shadow database if this installation is using one to improve
# performance.
-Bugzilla->switch_to_shadow_db();
-
-# More warning suppression silliness.
-$::userid = $::userid;
+my $dbh = Bugzilla->switch_to_shadow_db();
################################################################################
# Data/Security Validation #
@@ -49,31 +49,25 @@
# Make sure the bug ID is a positive integer representing an existing
# bug that the user is authorized to access.
-my $id = $cgi->param('id');
+my $id = $cgi->param('id') || ThrowUserError('invalid_bug_id_or_alias');
ValidateBugID($id);
+my $current_bug = new Bugzilla::Bug($id);
-my $hide_resolved = $cgi->param('hide_resolved') ? 1 : 0;
+local our $hide_resolved = $cgi->param('hide_resolved') ? 1 : 0;
-my $maxdepth = $cgi->param('maxdepth') || 0;
+local our $maxdepth = $cgi->param('maxdepth') || 0;
if ($maxdepth !~ /^\d+$/) { $maxdepth = 0 };
################################################################################
# Main Section #
################################################################################
-# The column/value to select as the target milestone for bugs,
-# either the target_milestone column or the empty string value
-# (for installations that don't use target milestones). Makes
-# it easier to query the database for bugs because we don't
-# have to embed a conditional statement into each query.
-my $milestone_column = Param('usetargetmilestone') ? "target_milestone" : "''";
-
-# The greatest depth to which either tree goes.
-my $realdepth = 0;
+# Stores the greatest depth to which either tree goes.
+local our $realdepth = 0;
# Generate the tree of bugs that this bug depends on and a list of IDs
# appearing in the tree.
-my $dependson_tree = { $id => GetBug($id) };
+my $dependson_tree = { $id => $current_bug };
my $dependson_ids = {};
GenerateTree($id, "dependson", 1, $dependson_tree, $dependson_ids);
$vars->{'dependson_tree'} = $dependson_tree;
@@ -81,7 +75,7 @@
# Generate the tree of bugs that this bug blocks and a list of IDs
# appearing in the tree.
-my $blocked_tree = { $id => GetBug($id) };
+my $blocked_tree = { $id => $current_bug };
my $blocked_ids = {};
GenerateTree($id, "blocked", 1, $blocked_tree, $blocked_ids);
$vars->{'blocked_tree'} = $blocked_tree;
@@ -92,7 +86,6 @@
$vars->{'bugid'} = $id;
$vars->{'maxdepth'} = $maxdepth;
$vars->{'hide_resolved'} = $hide_resolved;
-$vars->{'canedit'} = UserInGroup("editbugs");
print $cgi->header();
$template->process("bug/dependency-tree.html.tmpl", $vars)
@@ -105,15 +98,19 @@
sub GenerateTree {
# Generates a dependency tree for a given bug. Calls itself recursively
# to generate sub-trees for the bug's dependencies.
-
my ($bug_id, $relationship, $depth, $bugs, $ids) = @_;
-
- # Query the database for bugs with the given dependency relationship.
- my @dependencies = GetDependencies($bug_id, $relationship);
-
+
+ my @dependencies;
+ if ($relationship eq 'dependson') {
+ @dependencies = @{$bugs->{$bug_id}->dependson};
+ }
+ else {
+ @dependencies = @{$bugs->{$bug_id}->blocked};
+ }
+
# Don't do anything if this bug doesn't have any dependencies.
return unless scalar(@dependencies);
-
+
# Record this depth in the global $realdepth variable if it's farther
# than we've gone before.
$realdepth = max($realdepth, $depth);
@@ -123,7 +120,7 @@
# its sub-tree if we haven't already done so (which happens
# when bugs appear in dependency trees multiple times).
if (!$bugs->{$dep_id}) {
- $bugs->{$dep_id} = GetBug($dep_id);
+ $bugs->{$dep_id} = new Bugzilla::Bug($dep_id);
GenerateTree($dep_id, $relationship, $depth+1, $bugs, $ids);
}
@@ -131,64 +128,15 @@
# if it exists, if we haven't exceeded the maximum depth the user
# wants the tree to go, and if the dependency isn't resolved
# (if we're ignoring resolved dependencies).
- if ($bugs->{$dep_id}->{'exists'}
+ if (!$bugs->{$dep_id}->{'error'}
+ && Bugzilla->user->can_see_bug($dep_id)
&& (!$maxdepth || $depth <= $maxdepth)
- && ($bugs->{$dep_id}->{'open'} || !$hide_resolved))
+ && ($bugs->{$dep_id}->{'isopened'} || !$hide_resolved))
{
- push (@{$bugs->{$bug_id}->{'dependencies'}}, $dep_id);
+ # Due to AUTOLOAD in Bug.pm, we cannot add 'dependencies'
+ # as a bug object attribute from here.
+ push(@{$bugs->{'dependencies'}->{$bug_id}}, $dep_id);
$ids->{$dep_id} = 1;
}
}
}
-
-sub GetBug {
- # Retrieves the necessary information about a bug, stores it in the bug cache,
- # and returns it to the calling code.
- my ($id) = @_;
-
- my $bug = {};
- if (Bugzilla->user->can_see_bug($id)) {
- SendSQL("SELECT 1,
- bug_status,
- short_desc,
- $milestone_column,
- assignee.userid,
- assignee.login_name
- FROM bugs
- INNER JOIN profiles AS assignee
- ON bugs.assigned_to = assignee.userid
- WHERE bugs.bug_id = $id");
-
-
- ($bug->{'exists'},
- $bug->{'status'},
- $bug->{'summary'},
- $bug->{'milestone'},
- $bug->{'assignee_id'},
- $bug->{'assignee_email'}) = FetchSQLData();
- }
-
- $bug->{'open'} = $bug->{'exists'} && IsOpenedState($bug->{'status'});
- $bug->{'dependencies'} = [];
-
- return $bug;
-}
-
-sub GetDependencies {
- # Returns a list of dependencies for a given bug.
-
- my ($id, $relationship) = @_;
-
- my $bug_type = ($relationship eq "blocked") ? "dependson" : "blocked";
-
- SendSQL(" SELECT $relationship
- FROM dependencies
- WHERE $bug_type = $id
- ORDER BY $relationship");
-
- my @dependencies = ();
- push(@dependencies, FetchOneColumn()) while MoreSQLData();
-
- return @dependencies;
-}
-
