mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 22:32:46 +00:00
Bug 71790 - Duplicate resolution field should include bug number of original
r=bbaetz,a=justdave
This commit is contained in:
parent
0073596cba
commit
7a29882ad1
@ -262,6 +262,24 @@ sub initBug {
|
||||
return $self;
|
||||
}
|
||||
|
||||
sub dup_id {
|
||||
my ($self) = @_;
|
||||
|
||||
return $self->{'dup_id'} if exists $self->{'dup_id'};
|
||||
|
||||
$self->{'dup_id'} = undef;
|
||||
if ($self->{'resolution'} eq 'DUPLICATE') {
|
||||
my $dbh = Bugzilla->dbh;
|
||||
$self->{'dup_id'} =
|
||||
$dbh->selectrow_array(q{SELECT dupe_of
|
||||
FROM duplicates
|
||||
WHERE dupe = ?},
|
||||
undef,
|
||||
$self->{'bug_id'});
|
||||
}
|
||||
return $self->{'dup_id'};
|
||||
}
|
||||
|
||||
sub actual_time {
|
||||
my ($self) = @_;
|
||||
|
||||
|
@ -262,6 +262,24 @@ sub initBug {
|
||||
return $self;
|
||||
}
|
||||
|
||||
sub dup_id {
|
||||
my ($self) = @_;
|
||||
|
||||
return $self->{'dup_id'} if exists $self->{'dup_id'};
|
||||
|
||||
$self->{'dup_id'} = undef;
|
||||
if ($self->{'resolution'} eq 'DUPLICATE') {
|
||||
my $dbh = Bugzilla->dbh;
|
||||
$self->{'dup_id'} =
|
||||
$dbh->selectrow_array(q{SELECT dupe_of
|
||||
FROM duplicates
|
||||
WHERE dupe = ?},
|
||||
undef,
|
||||
$self->{'bug_id'});
|
||||
}
|
||||
return $self->{'dup_id'};
|
||||
}
|
||||
|
||||
sub actual_time {
|
||||
my ($self) = @_;
|
||||
|
||||
|
@ -217,7 +217,7 @@ sub create {
|
||||
my ($context, $bug) = @_;
|
||||
return sub {
|
||||
my $text = shift;
|
||||
return &::GetBugLink($text, $bug);
|
||||
return &::GetBugLink($bug, $text);
|
||||
};
|
||||
},
|
||||
1
|
||||
|
@ -160,7 +160,12 @@
|
||||
<a href="bug_status.html">Resolution</a>:
|
||||
</b>
|
||||
</td>
|
||||
<td>[% bug.resolution FILTER html %]</td>
|
||||
<td>
|
||||
[% bug.resolution FILTER html %]
|
||||
[% IF bug.resolution == "DUPLICATE" %]
|
||||
of [% "bug ${bug.dup_id}" FILTER bug_link(bug.dup_id) %]
|
||||
[% END %]
|
||||
</td>
|
||||
<td> </td>
|
||||
|
||||
<td align="right">
|
||||
|
Loading…
Reference in New Issue
Block a user