github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-25 05:03:42 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: only show automatic group tooltip to admins (#30155)

Browse Source 
Follow up to #28630 which added the tooltip on automatic group.

It was missing a check to ensure the current user is an admin, since only admins can manage automatic groups.

Reported in https://meta.discourse.org/t/324215 by @moin-Jana
This commit is contained in:
Régis Hanol 2024-12-06 15:43:03 +01:00 committed by GitHub
parent 4f4498994c
commit 35ecd0335c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/templates/group.hbs
View File

@ -41,7 +41,7 @@
</div> </div>
{{/if}} {{/if}}
{{#if this.model.automatic}} {{#if (and this.currentUser.admin this.model.automatic)}}
<DTooltip class="admin-group-automatic-tooltip"> <DTooltip class="admin-group-automatic-tooltip">
<:trigger> <:trigger>
{{d-icon "gear"}} {{d-icon "gear"}}

18
app/assets/javascripts/discourse/tests/acceptance/group-manage-membership-test.js
View File

@ -24,6 +24,24 @@ acceptance("Managing Group Membership", function (needs) {
); );
}); });
test("As an admin on an automatic group", async function (assert) {
await visit("/g/moderators");
assert
.dom(".admin-group-automatic-tooltip")
.exists("displays automatic tooltip");
});
test("As a non-admin user on an automatic group", async function (assert) {
updateCurrentUser({ admin: false });
await visit("/g/moderators");
assert
.dom(".admin-group-automatic-tooltip")
.doesNotExist("does not display automatic tooltip");
});
test("As an admin", async function (assert) { test("As an admin", async function (assert) {
updateCurrentUser({ can_create_group: true }); updateCurrentUser({ can_create_group: true });