Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Admins should always be able to see groups so they can edit them.

This commit is contained in:
Robin Ward 2014-04-23 11:14:34 -04:00
parent 387ac342ce
commit 84da39f5dc
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/guardian.rb
View File

@ -110,7 +110,7 @@ class Guardian
alias :can_grant_badges? :can_moderate? alias :can_grant_badges? :can_moderate?
def can_see_group?(group) def can_see_group?(group)
group.present? && group.visible? group.present? && (is_admin? || group.visible?)
end end

12
spec/components/guardian_spec.rb
View File

@ -239,12 +239,20 @@ describe Guardian do
end end
describe 'a Group' do describe 'a Group' do
let(:group) { Group.new }
let(:invisible_group) { Group.new(visible: false) }
it "returns true when the group is visible" do it "returns true when the group is visible" do
Guardian.new.can_see?(Group.new).should be_true Guardian.new.can_see?(group).should be_true
end
it "returns true when the group is visible but the user is an admin" do
admin = Fabricate.build(:admin)
Guardian.new(admin).can_see?(invisible_group).should be_true
end end
it "returns false when the group is invisible" do it "returns false when the group is invisible" do
Guardian.new.can_see?(Group.new(visible: false)).should be_false Guardian.new.can_see?(invisible_group).should be_false
end end
end end