Merge "Remove parentheses around email in account-label"

polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.html

@@ -42,7 +42,7 @@ limitations under the License.
       <span class="text">
         <span>[[account.name]]</span>
         <span hidden$="[[!_computeShowEmail(showEmail, account)]]">
-          ([[account.email]])
+          [[_computeEmailStr(account)]]
         </span>
       </span>
     </span>

polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.js

@@ -44,5 +44,12 @@
     _computeShowEmail: function(showEmail, account) {
       return !!(showEmail && account && account.email);
     },
+
+    _computeEmailStr: function(account) {
+      if (account.name) {
+        return '(' + account.email + ')';
+      }
+      return account.email;
+    },
   });
 })();

polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_test.html

@@ -71,6 +71,9 @@ limitations under the License.
 
       assert.equal(element._computeShowEmail(
           false, undefined), false);
+
+      assert.equal(element._computeEmailStr({name: 'test', email: 'test'}), '(test)');
+      assert.equal(element._computeEmailStr({email: 'test'}, ''), 'test');
     });
 
   });