Merge "PolyGerrit: Add gr-account-link to gr-group-members"
This commit is contained in:
@@ -21,6 +21,7 @@ limitations under the License.
|
|||||||
<link rel="import" href="../../../bower_components/iron-input/iron-input.html">
|
<link rel="import" href="../../../bower_components/iron-input/iron-input.html">
|
||||||
<link rel="import" href="../../../styles/gr-form-styles.html">
|
<link rel="import" href="../../../styles/gr-form-styles.html">
|
||||||
<link rel="import" href="../../../styles/shared-styles.html">
|
<link rel="import" href="../../../styles/shared-styles.html">
|
||||||
|
<link rel="import" href="../../shared/gr-account-link/gr-account-link.html">
|
||||||
<link rel="import" href="../../shared/gr-autocomplete/gr-autocomplete.html">
|
<link rel="import" href="../../shared/gr-autocomplete/gr-autocomplete.html">
|
||||||
<link rel="import" href="../../shared/gr-button/gr-button.html">
|
<link rel="import" href="../../shared/gr-button/gr-button.html">
|
||||||
<link rel="import" href="../../shared/gr-overlay/gr-overlay.html">
|
<link rel="import" href="../../shared/gr-overlay/gr-overlay.html">
|
||||||
@@ -107,7 +108,7 @@ limitations under the License.
|
|||||||
<template is="dom-repeat" items="[[_groupMembers]]">
|
<template is="dom-repeat" items="[[_groupMembers]]">
|
||||||
<tr>
|
<tr>
|
||||||
<td class="nameColumn">
|
<td class="nameColumn">
|
||||||
<a href$="[[_memberUrl(item)]]">[[item.name]]</a>
|
<gr-account-link account="[[item]]"></gr-account-link>
|
||||||
</td>
|
</td>
|
||||||
<td>[[item.email]]</td>
|
<td>[[item.email]]</td>
|
||||||
<td hidden$="[[!_groupOwner]]">
|
<td hidden$="[[!_groupOwner]]">
|
||||||
|
|||||||
@@ -93,18 +93,6 @@
|
|||||||
return this._loading || this._loading === undefined;
|
return this._loading || this._loading === undefined;
|
||||||
},
|
},
|
||||||
|
|
||||||
_memberUrl(item) {
|
|
||||||
if (item.email) {
|
|
||||||
item = item.email;
|
|
||||||
} else if (item.username) {
|
|
||||||
item = item.username;
|
|
||||||
} else {
|
|
||||||
item = item.name;
|
|
||||||
}
|
|
||||||
return this.getBaseUrl() + '/q/owner:' + this.encodeURL(item, true) +
|
|
||||||
' status:open';
|
|
||||||
},
|
|
||||||
|
|
||||||
_groupUrl(item) {
|
_groupUrl(item) {
|
||||||
return this.getBaseUrl() + '/admin/groups/' + this.encodeURL(item, true);
|
return this.getBaseUrl() + '/admin/groups/' + this.encodeURL(item, true);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -32,7 +32,8 @@
|
|||||||
_computeOwnerLink(account) {
|
_computeOwnerLink(account) {
|
||||||
if (!account) { return; }
|
if (!account) { return; }
|
||||||
return Gerrit.Nav.getUrlForOwner(
|
return Gerrit.Nav.getUrlForOwner(
|
||||||
account.email || account.username || account._account_id);
|
account.email || account.username || account.name ||
|
||||||
|
account._account_id);
|
||||||
},
|
},
|
||||||
|
|
||||||
_computeShowEmail(account) {
|
_computeShowEmail(account) {
|
||||||
|
|||||||
Reference in New Issue
Block a user