From c373d57e5911436cb15006ea88e685abda0a6b6f Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Fri, 1 Nov 2013 10:51:32 -0400
Subject: Bug 921219 - Include status and summary for bugs listed in
 `depends_on` and `blocks` fields r=glob

---
 extensions/Ember/lib/WebService.pm | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

(limited to 'extensions/Ember')

diff --git a/extensions/Ember/lib/WebService.pm b/extensions/Ember/lib/WebService.pm
index 854a94689..0e9505fb8 100644
--- a/extensions/Ember/lib/WebService.pm
+++ b/extensions/Ember/lib/WebService.pm
@@ -113,12 +113,13 @@ sub show {
     my ($self, $params) = @_;
     my (@fields, $attachments, $comments, $data);
     my $dbh = Bugzilla->dbh;
+    my $user = Bugzilla->user;
 
     Bugzilla->switch_to_shadow_db();
 
     # Throw error if token was provided and user is not logged
     # in meaning token was invalid/expired.
-    if (exists $params->{token} && !Bugzilla->user->id) {
+    if (exists $params->{token} && !$user->id) {
         ThrowUserError('invalid_token');
     }
 
@@ -177,7 +178,34 @@ sub show {
 
     # Place the fields current value along with the field definition
     foreach my $field (@fields) {
-        $field->{current_value} = delete $bug_hash->{$field->{name}} || '';
+        if (($field->{name} eq 'depends_on'
+            || $field->{name} eq 'blocks')
+            && scalar @{ $bug_hash->{$field->{name}} })
+        {
+            my $bug_ids = $bug_hash->{$field->{name}};
+            $user->visible_bugs($bug_ids);
+            my $bug_objs = Bugzilla::Bug->new_from_list($bug_ids);
+
+            my @new_list;
+            foreach my $bug (@$bug_objs) {
+                my $data;
+                if ($user->can_see_bug($bug)) {
+                    $data = {
+                        id      => $bug->id,
+                        status  => $bug->bug_status,
+                        summary => $bug->short_desc
+                    };
+                }
+                else {
+                    $data = { id => $bug->id };
+                }
+                push(@new_list, $data);
+            }
+            $field->{current_value} = \@new_list;
+        }
+        else {
+            $field->{current_value} = delete $bug_hash->{$field->{name}} || '';
+        }
     }
 
     # Any left over bug values will be added to the field list
-- 
cgit v1.2.3-24-g4f1b