From c1769b0ec503586599dcf1815ffb48de0f70e96b Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Fri, 6 Sep 2019 01:27:29 +0530 Subject: [PATCH] DEV: improve the code readability. 82c5a1d20fa9215b5a8c1bed83db3444f9c418f6 --- .../discourse/components/groups-form-membership-fields.js.es6 | 4 ++-- app/assets/javascripts/discourse/models/group.js.es6 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6 b/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6 index 6cf923d39d0..7a9849463a1 100644 --- a/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6 +++ b/app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6 @@ -19,12 +19,12 @@ export default Ember.Component.extend({ @computed("model.visibility_level", "model.public_admission") disableMembershipRequestSetting(visibility_level, publicAdmission) { visibility_level = parseInt(visibility_level); - return ![0, 1].includes(visibility_level) || publicAdmission; + return publicAdmission || visibility_level > 1; }, @computed("model.visibility_level", "model.allow_membership_requests") disablePublicSetting(visibility_level, allowMembershipRequests) { visibility_level = parseInt(visibility_level); - return ![0, 1].includes(visibility_level) || allowMembershipRequests; + return allowMembershipRequests || visibility_level > 1; } }); diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6 index 383c46861b6..56394330a37 100644 --- a/app/assets/javascripts/discourse/models/group.js.es6 +++ b/app/assets/javascripts/discourse/models/group.js.es6 @@ -139,7 +139,7 @@ const Group = RestModel.extend({ @computed("visibility_level") isPrivate(visibilityLevel) { - return ![0, 1].includes(visibilityLevel); + return visibility_level > 1; }, @observes("isPrivate", "canEveryoneMention")