mirror of
https://github.com/diaspora/diaspora.git
synced 2026-01-09 07:08:07 -05:00
fixes #8319
This commit is contained in:
@@ -52,9 +52,9 @@ module Configuration
|
||||
|
||||
def local_posts_stream?(user)
|
||||
return true if settings.enable_local_posts_stream == "admins" &&
|
||||
Role.is_admin?(user)
|
||||
user.admin?
|
||||
return true if settings.enable_local_posts_stream == "moderators" &&
|
||||
(Role.moderator?(user) || Role.is_admin?(user))
|
||||
user.moderator?
|
||||
|
||||
settings.enable_local_posts_stream == "everyone"
|
||||
end
|
||||
|
||||
@@ -129,11 +129,11 @@ describe Configuration::Methods do
|
||||
end
|
||||
|
||||
describe "#has_local_posts_stream" do
|
||||
let!(:moderator) { create(:person) }
|
||||
let!(:admin) { create(:person) }
|
||||
let!(:moderator) { create(:user) }
|
||||
let!(:admin) { create(:user) }
|
||||
before do
|
||||
moderator.roles.create(name: "moderator")
|
||||
admin.roles.create(name: "admin")
|
||||
Role.add_moderator(moderator.person)
|
||||
Role.add_admin(admin.person)
|
||||
end
|
||||
|
||||
it "return false if show_local_posts_link is 'disabled'" do
|
||||
|
||||
Reference in New Issue
Block a user