From e63614024dde48201085c7fe44e4d0a957f00104 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Fri, 12 May 2017 09:25:38 +0800
Subject: [PATCH] FIX: Users can't request to join group due to alias level
restriction.
https://meta.discourse.org/t/request-to-join-group-not-working/62371
---
.../components/group-membership-button.js.es6 | 5 -----
.../components/group-membership-button.hbs | 2 +-
.../group-membership-button-test.js.es6 | 18 ------------------
3 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/app/assets/javascripts/discourse/components/group-membership-button.js.es6 b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
index 83ad277df27..b5911799093 100644
--- a/app/assets/javascripts/discourse/components/group-membership-button.js.es6
+++ b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
@@ -8,11 +8,6 @@ export default Ember.Component.extend({
return publicGroup;
},
- @computed('model.allow_membership_requests', 'model.alias_level')
- canRequestMembership(allowMembershipRequests, aliasLevel) {
- return allowMembershipRequests && aliasLevel === 99;
- },
-
@computed("model.is_group_user", "model.id", "groupUserIds")
userIsGroupUser(isGroupUser, groupId, groupUserIds) {
if (isGroupUser !== undefined) {
diff --git a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs b/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
index bd2d456feee..fb1444bbf37 100644
--- a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
@@ -12,7 +12,7 @@
label="groups.join"
disabled=updatingMembership}}
{{/if}}
-{{else if canRequestMembership}}
+{{else if model.allow_membership_requests}}
{{#if userIsGroupUser}}
{{#if showMembershipStatus}}
{{d-button
diff --git a/test/javascripts/components/group-membership-button-test.js.es6 b/test/javascripts/components/group-membership-button-test.js.es6
index 90831ec9c51..a8c54411084 100644
--- a/test/javascripts/components/group-membership-button-test.js.es6
+++ b/test/javascripts/components/group-membership-button-test.js.es6
@@ -18,24 +18,6 @@ test('canJoinGroup', function() {
equal(this.subject().get("canJoinGroup"), true, "can't join group when not logged in");
});
-test('canRequestMembership', function() {
- this.subject().setProperties({
- model: { allow_membership_requests: false, alias_level: 0 }
- });
-
- equal(this.subject().get('canRequestMembership'), false);
-
- this.subject().setProperties({
- currentUser: currentUser(), model: { allow_membership_requests: true, alias_level: 99 }
- });
-
- equal(this.subject().get('canRequestMembership'), true);
-
- this.subject().set("model.alias_level", 0);
-
- equal(this.subject().get('canRequestMembership'), false);
-});
-
test('userIsGroupUser', function() {
this.subject().setProperties({
model: { is_group_user: true }