Bug 71790 - Duplicate resolution field should include bug number of original

r=bbaetz,a=justdave

diff --git a/Bug.pm b/Bug.pm
index b451190e2a41866c3d22d3a97e61a2ee6ba44a5a..9e8e44c55bfbcbd7da31f65ada9d12218d2abff1 100755 (executable)
--- a/Bug.pm
+++ b/Bug.pm
@@ -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) = @_;
 

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index b451190e2a41866c3d22d3a97e61a2ee6ba44a5a..9e8e44c55bfbcbd7da31f65ada9d12218d2abff1 100755 (executable)
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -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) = @_;
 

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 463247c86de57f03583d1c19c62bfc1c9f430e23..e596af2269f5406eb492cabad54a77c71e10fcf7 100644 (file)
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -217,7 +217,7 @@ sub create {
                               my ($context, $bug) = @_;
                               return sub {
                                   my $text = shift;
-                                  return &::GetBugLink($text, $bug);
+                                  return &::GetBugLink($bug, $text);
                               };
                           },
                           1

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 2d930625605e1ff2075951f2e794aafdb356f5a5..6d512e1fd820efff0c7f6cfc2bb33f0a7874cd7c 100644 (file)
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -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>&nbsp;</td>
       
       <td align="right">