github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 05:03:39 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

FIX: If personal messages are disabled, don't show messages for groups

Browse Source
This commit is contained in:
Robin Ward 2018-02-02 16:35:32 -05:00
parent e262939590
commit 2f19588311
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/controllers/group-activity.js.es6
View File

@ -6,6 +6,9 @@ export default Ember.Controller.extend({
@computed('model.is_group_user')
showGroupMessages(isGroupUser) {
if (!this.siteSettings.enable_personal_messages) {
return false;
}
return isGroupUser || (this.currentUser && this.currentUser.admin);
}
});

4
lib/guardian/group_guardian.rb
View File

@ -13,6 +13,8 @@ module GroupGuardian
end
def can_see_group_messages?(group)
is_admin? || group.users.include?(user)
SiteSetting.enable_private_messages? && (
is_admin? || group.users.include?(user)
)
end
end