nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes #8319

Browse source
This commit is contained in:
Thorsten Claus 2021-11-07 10:54:11 +01:00
parent d1e0b163e2
commit d531b64d66
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/configuration_methods.rb
View file

@ -52,9 +52,9 @@ module Configuration
def local_posts_stream?(user) def local_posts_stream?(user)
return true if settings.enable_local_posts_stream == "admins" && return true if settings.enable_local_posts_stream == "admins" &&
Role.is_admin?(user) user.admin?
return true if settings.enable_local_posts_stream == "moderators" && return true if settings.enable_local_posts_stream == "moderators" &&
(Role.moderator?(user) || Role.is_admin?(user)) user.moderator?
settings.enable_local_posts_stream == "everyone" settings.enable_local_posts_stream == "everyone"
end end

8
spec/lib/configuration_methods_spec.rb
View file

@ -129,11 +129,11 @@ describe Configuration::Methods do
end end
describe "#has_local_posts_stream" do describe "#has_local_posts_stream" do
let!(:moderator) { create(:person) } let!(:moderator) { create(:user) }
let!(:admin) { create(:person) } let!(:admin) { create(:user) }
before do before do
moderator.roles.create(name: "moderator") Role.add_moderator(moderator.person)
admin.roles.create(name: "admin") Role.add_admin(admin.person)
end end
it "return false if show_local_posts_link is 'disabled'" do it "return false if show_local_posts_link is 'disabled'" do