github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-21 03:11:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Make 'group membership requests' feature compatible with visibility level option 'logged_on_users'.

Browse Source
This commit is contained in:
Vinoth Kannan 2019-09-04 03:22:55 +05:30
parent c468abe9d0
commit 82c5a1d20f
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/components/groups-form-membership-fields.js.es6
View File

@ -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 visibility_level !== 0 || publicAdmission;
return ![0, 1].includes(visibility_level) || publicAdmission;
},
@computed("model.visibility_level", "model.allow_membership_requests")
disablePublicSetting(visibility_level, allowMembershipRequests) {
visibility_level = parseInt(visibility_level);
return visibility_level !== 0 || allowMembershipRequests;
return ![0, 1].includes(visibility_level) || allowMembershipRequests;
}
});

9
app/assets/javascripts/discourse/models/group.js.es6
View File

@ -139,7 +139,7 @@ const Group = RestModel.extend({
@computed("visibility_level")
isPrivate(visibilityLevel) {
return visibilityLevel !== 0;
return ![0, 1].includes(visibilityLevel);
},
@observes("isPrivate", "canEveryoneMention")
@ -149,13 +149,6 @@ const Group = RestModel.extend({
}
},
@observes("visibility_level")
_updatePublic() {
if (this.isPrivate) {
this.setProperties({ public: false, allow_membership_requests: false });
}
},
asJSON() {
const attrs = {
name: this.name,