mirror of
https://github.com/discourse/discourse.git
synced 2025-05-28 11:11:59 +08:00
FIX: Hide group membership request button for existing members
This commit is contained in:
@ -15,6 +15,11 @@ export default Ember.Component.extend({
|
|||||||
return publicExit && userIsGroupUser;
|
return publicExit && userIsGroupUser;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@computed("model.allow_membership_requests", "userIsGroupUser")
|
||||||
|
canRequestMembership(allowMembershipRequests, userIsGroupUser) {
|
||||||
|
return allowMembershipRequests && !userIsGroupUser;
|
||||||
|
},
|
||||||
|
|
||||||
@computed("model.is_group_user")
|
@computed("model.is_group_user")
|
||||||
userIsGroupUser(isGroupUser) {
|
userIsGroupUser(isGroupUser) {
|
||||||
return !!isGroupUser;
|
return !!isGroupUser;
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
icon="user-times"
|
icon="user-times"
|
||||||
label="groups.leave"
|
label="groups.leave"
|
||||||
disabled=updatingMembership}}
|
disabled=updatingMembership}}
|
||||||
{{else if model.allow_membership_requests}}
|
{{else if canRequestMembership}}
|
||||||
{{d-button action="showRequestMembershipForm"
|
{{d-button action="showRequestMembershipForm"
|
||||||
class="group-index-request"
|
class="group-index-request"
|
||||||
disabled=loading
|
disabled=loading
|
||||||
|
@ -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) {
|
QUnit.test("userIsGroupUser", function(assert) {
|
||||||
this.subject().setProperties({
|
this.subject().setProperties({
|
||||||
model: { is_group_user: true }
|
model: { is_group_user: true }
|
||||||
|
Reference in New Issue
Block a user