From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Wed, 14 Nov 2018 23:07:16 +0000 (-0500)
Subject: Bug 1480042 - Request queue dropdown badge shows empty names for some display names
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63157013a2aa25077f3100f38c0b5d4d548d03fc;p=thirdparty%2Fbugzilla.git

Bug 1480042 - Request queue dropdown badge shows empty names for some display names
---

diff --git a/extensions/Review/web/js/badge.js b/extensions/Review/web/js/badge.js
index 411a71742..7280e7188 100644
--- a/extensions/Review/web/js/badge.js
+++ b/extensions/Review/web/js/badge.js
@@ -84,15 +84,14 @@ Bugzilla.Review.Badge = class Badge {
         // Show up to 20 newest requests
         requests.slice(0, 20).forEach(req => {
             const $li = document.createElement('li');
-            const [, name, email] = req.requester.match(/^(?:(.*)\s<)?(.+?)>?$/);
-            const pretty_name = name ? name.replace(/([\[\(<‹].*?[›>\)\]]|\:[\w\-]+|\s+\-\s+.*)/g, '').trim() : email;
+            const { nick, gravatar } = req.requester;
             const [link, attach_label] = this.get_link(req);
 
             $li.setAttribute('role', 'none');
             $li.innerHTML = `<a href="${link.htmlEncode()}" role="menuitem" tabindex="-1" `
                 + `class="${(req.restricted ? 'secure' : '')}" data-type="${req.type}">`
-                + `<img src="https://secure.gravatar.com/avatar/${md5(email.toLowerCase())}?d=mm&amp;size=64" alt="">`
-                + `<label><strong>${pretty_name.htmlEncode()}</strong> asked for your `
+                + `<img src="${gravatar}" alt="">`
+                + `<label><strong>${nick.htmlEncode()}</strong> asked for your `
                 + (req.type === 'needinfo' ? 'info' : req.type) + (attach_label ? ` on ${attach_label}` : '')
                 + ' in ' + (req.restricted ? '<span class="icon" aria-label="secure"></span>&nbsp;' : '')
                 + `<strong>Bug ${req.bug_id} &ndash; ${req.bug_summary.htmlEncode()}</strong>.</label>`
diff --git a/request.cgi b/request.cgi
index 9f5d249cc..712013d78 100755
--- a/request.cgi
+++ b/request.cgi
@@ -288,8 +288,8 @@ sub queue {
           'category'        => "$data->[5]: $data->[6]" ,
           'attach_id'       => $data->[7] ,
           'attach_summary'  => $data->[8] ,
-          'requester'       => ($data->[9] ? "$data->[9] <$data->[10]>" : $data->[10]) ,
-          'requestee'       => ($data->[11] ? "$data->[11] <$data->[12]>" : $data->[12]) ,
+          'requester'       => Bugzilla::User->new({ name => $data->[10], cache => 1 }) ,
+          'requestee'       => Bugzilla::User->new({ name => $data->[12], cache => 1 }) ,
           'restricted'      => $data->[13] ? 1 : 0,
           'created'         => $data->[14],
           'attach_mimetype' => $data->[15],
diff --git a/template/en/default/request/queue.csv.tmpl b/template/en/default/request/queue.csv.tmpl
index c6d962b4f..16c7bd780 100644
--- a/template/en/default/request/queue.csv.tmpl
+++ b/template/en/default/request/queue.csv.tmpl
@@ -36,7 +36,11 @@ No requests.
       [% IF column == 'created' %]
         [% request.$column FILTER time FILTER csv %]
       [% ELSIF column.match('^requeste') %]
-        [% request.$column FILTER email FILTER csv %]
+        [% IF request.$column.name %]
+          [% request.$column.name _ ' <' _ request.$column.email _ '>' FILTER email FILTER csv %]
+        [% ELSE %]
+          [% request.$column.email FILTER email FILTER csv %]
+        [% END %]
       [% ELSE %]
         [% request.$column FILTER csv %]
       [% END %][% ',' IF NOT loop.last() %]
diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl
index 44d3933ca..e87b703ac 100644
--- a/template/en/default/request/queue.html.tmpl
+++ b/template/en/default/request/queue.html.tmpl
@@ -265,11 +265,19 @@ to some group are shown by default.
 [% END %]
 
 [% BLOCK display_requestee %]
-  [% request.requestee FILTER email FILTER html %]
+  [% IF request.requestee.name %]
+    [% request.requestee.name _ ' <' _ request.requestee.email _ '>' FILTER email FILTER html %]
+  [% ELSE %]
+    [% request.requestee.email FILTER email FILTER html %]
+  [% END %]
 [% END %]
 
 [% BLOCK display_requester %]
-  [% request.requester FILTER email FILTER html %]
+  [% IF request.requester.name %]
+    [% request.requester.name _ ' <' _ request.requester.email _ '>' FILTER email FILTER html %]
+  [% ELSE %]
+    [% request.requester.email FILTER email FILTER html %]
+  [% END %]
 [% END %]
 
 [% BLOCK display_created %]
diff --git a/template/en/default/request/queue.json.tmpl b/template/en/default/request/queue.json.tmpl
index 50638de9e..bc106a10b 100644
--- a/template/en/default/request/queue.json.tmpl
+++ b/template/en/default/request/queue.json.tmpl
@@ -22,7 +22,10 @@ foreach my $request (@$requests) {
             $val = $time_filter->( $request->{$column} );
         }
         elsif ( $column =~ /^requeste/ ) {
-            $val = $mail_filter->( $request->{$column} );
+            $val = {
+                nick => $request->{$column}->nick,
+                gravatar => $request->{$column}->gravatar,
+            };
         }
         elsif ( $column =~ /_id$/ ) {
             $val = $request->{$column} ? 0 + $request->{$column} : undef;