IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Hide group membership request button for existing members

Browse Source
This commit is contained in:
Vinoth Kannan 2018-12-24 13:49:05 +05:30
parent 7b253dbe4a
commit b3df4bee9c
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/components/group-membership-button.js.es6
View File

@ -15,6 +15,11 @@ export default Ember.Component.extend({
return publicExit && userIsGroupUser;
},
@computed("model.allow_membership_requests", "userIsGroupUser")
canRequestMembership(allowMembershipRequests, userIsGroupUser) {
return allowMembershipRequests && !userIsGroupUser;
},
@computed("model.is_group_user")
userIsGroupUser(isGroupUser) {
return !!isGroupUser;

2
app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
View File

@ -10,7 +10,7 @@
icon="user-times"
label="groups.leave"
disabled=updatingMembership}}
{{else if model.allow_membership_requests}}
{{else if canRequestMembership}}
{{d-button action="showRequestMembershipForm"
class="group-index-request"
disabled=loading

20
test/javascripts/components/group-membership-button-test.js.es6
View File

@ -56,6 +56,26 @@ QUnit.test("canLeaveGroup", function(assert) {
);
});
QUnit.test("canRequestMembership", function(assert) {
this.subject().setProperties({
model: { allow_membership_requests: true, is_group_user: true }
});
assert.equal(
this.subject().get("canRequestMembership"),
false,
"can't request for membership if user is already in the group"
);
this.subject().set("model.is_group_user", false);
assert.equal(
this.subject().get("canRequestMembership"),
true,
"allowed to request for group membership"
);
});
QUnit.test("userIsGroupUser", function(assert) {
this.subject().setProperties({
model: { is_group_user: true }