Skip to content

A platform for community discussion. Free, open, simple.

UX: show group ownership and status to all users (#39987)

Kris5416633d52d8
diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss
index 3b07a4900d5..ae6af25ffc9 100644
--- a/app/assets/stylesheets/common/base/group.scss
+++ b/app/assets/stylesheets/common/base/group.scss
@@ -161,7 +161,7 @@ table.group-manage-logs {
}
.group-members {
- grid-template-columns: 3fr repeat(3, minmax(min-content, 1fr));
+ grid-template-columns: 3fr repeat(4, minmax(min-content, 1fr));
&--can-manage {
grid-template-columns: 3fr repeat(4, minmax(min-content, 1fr)) 3em;
diff --git a/frontend/discourse/app/templates/group/index.gjs b/frontend/discourse/app/templates/group/index.gjs
index ba292a98fa7..92e0f7a63ad 100644
--- a/frontend/discourse/app/templates/group/index.gjs
+++ b/frontend/discourse/app/templates/group/index.gjs
@@ -114,11 +114,9 @@ export default <template>
class="directory-table__column-header--username username"
/>
- {{#if @controller.canManageGroup}}
- <div
- class="directory-table__column-header directory-table__column-header--can-manage"
- ></div>
- {{/if}}
+ <div
+ class="directory-table__column-header directory-table__column-header--can-manage"
+ ></div>
<PluginOutlet
@name="group-index-table-header-after-username"
@@ -188,27 +186,25 @@ export default <template>
/>
</div>
- {{#if @controller.canManageGroup}}
- <div
- class="directory-table__cell directory-table__cell--can-manage group-owner"
- >
- {{#if (or m.owner m.primary)}}
- <span class="directory-table__label">
- <span>{{i18n "groups.members.status"}}</span>
- </span>
- {{/if}}
- <span class="directory-table__value">
- {{#if m.owner}}
- {{dIcon "shield-halved"}}
- {{i18n "groups.members.owner"}}<br />
- {{/if}}
- {{#if m.primary}}
- {{i18n "groups.members.primary"}}
- {{/if}}
+ <div
+ class="directory-table__cell directory-table__cell--can-manage group-owner"
+ >
+ {{#if (or m.owner m.primary)}}
+ <span class="directory-table__label">
+ <span>{{i18n "groups.members.status"}}</span>
</span>
+ {{/if}}
+ <span class="directory-table__value">
+ {{#if m.owner}}
+ {{dIcon "shield-halved"}}
+ {{i18n "groups.members.owner"}}<br />
+ {{/if}}
+ {{#if m.primary}}
+ {{i18n "groups.members.primary"}}
+ {{/if}}
+ </span>
- </div>
- {{/if}}
+ </div>
<PluginOutlet
@name="group-index-table-row-after-username"
diff --git a/spec/system/viewing_group_members_spec.rb b/spec/system/viewing_group_members_spec.rb
index 3a48af4c8e4..875f9cfbaf3 100644
--- a/spec/system/viewing_group_members_spec.rb
+++ b/spec/system/viewing_group_members_spec.rb
@@ -13,4 +13,16 @@ RSpec.describe "Viewing group members" do
expect(page).to have_selector(".group-member", count: 3)
end
end
+
+ it "shows the owner badge to viewers who can't manage the group" do
+ group.add_owner(user_in_group_1)
+ sign_in(Fabricate(:user))
+
+ visit("/g/#{group.name}/members")
+
+ expect(page).to have_css(
+ ".directory-table__cell.group-owner",
+ text: I18n.t("js.groups.members.owner"),
+ )
+ end
end