UX: Indicate user's group membership on groups page.
This commit is contained in:
@@ -13,12 +13,12 @@ export default Ember.Component.extend({
|
||||
return publicExit && userIsGroupUser;
|
||||
},
|
||||
|
||||
@computed("model.is_group_user", "model.id", "groupUserIds")
|
||||
userIsGroupUser(isGroupUser, groupId, groupUserIds) {
|
||||
@computed("model.is_group_user")
|
||||
userIsGroupUser(isGroupUser) {
|
||||
if (isGroupUser !== undefined) {
|
||||
return isGroupUser;
|
||||
} else {
|
||||
return !!groupUserIds && groupUserIds.includes(groupId);
|
||||
return false;
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
<th></th>
|
||||
{{directory-toggle field="user_count" labelKey="groups.user_count" order=order asc=asc}}
|
||||
<th>{{i18n "groups.membership"}}</th>
|
||||
<th></th>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
@@ -52,7 +53,6 @@
|
||||
<td>
|
||||
{{#group-membership-button model=group
|
||||
showMembershipStatus=true
|
||||
groupUserIds=groups.extras.group_user_ids
|
||||
showLogin='showLogin'}}
|
||||
|
||||
{{d-button icon="ban"
|
||||
@@ -60,6 +60,16 @@
|
||||
disabled=true}}
|
||||
{{/group-membership-button}}
|
||||
</td>
|
||||
|
||||
<td class="group-user-status">
|
||||
{{#if group.is_group_user}}
|
||||
{{d-icon "user" title="groups.is_group_user"}}
|
||||
{{/if}}
|
||||
|
||||
{{#if group.is_group_owner}}
|
||||
{{d-icon "shield" title="groups.is_group_owner"}}
|
||||
{{/if}}
|
||||
</td>
|
||||
</tr>
|
||||
{{/each}}
|
||||
</tbody>
|
||||
|
||||
Reference in New Issue
Block a user