[Git][noosfero/noosfero][stable-1.10] Merge branch 'show-block-to-admins' into 'master'

[Rodrigo Souto]

Rodrigo Souto pushed to branch stable-1.10 at Noosfero / noosfero


Commits:
a0a12743 by Leandro Nunes at 2018-01-22T15:25:51+00:00
Merge branch 'show-block-to-admins' into 'master'

block: always display block to environment admins

See merge request noosfero/noosfero!1379

(cherry picked from commit 3f06a44c157140d010d989bfe59a47383ed23002)

0a7584e2 block: always display block to environment admins
- - - - -


2 changed files:

- app/models/block.rb
- test/unit/block_test.rb


Changes:

=====================================
app/models/block.rb
=====================================
--- a/app/models/block.rb
+++ b/app/models/block.rb
@@ -103,7 +103,7 @@ class Block < ApplicationRecord
   end
 
   def display_to_user?(user)
-    display_user == 'all' || (user.nil? && display_user == 'not_logged') || (user && display_user == 'logged') || (user && !self.owner.kind_of?(Environment) && display_user == 'followers' && owner.in_social_circle?(user) && self.owner.kind_of?(Profile))
+    display_user == 'all' || (environment.present? && environment.admins.include?(user)) || (user.nil? && display_user == 'not_logged') || (user && display_user == 'logged') || (user && !self.owner.kind_of?(Environment) && display_user == 'followers' && owner.in_social_circle?(user) && self.owner.kind_of?(Profile))
   end
 
   def display_always(context)


=====================================
test/unit/block_test.rb
=====================================
--- a/test/unit/block_test.rb
+++ b/test/unit/block_test.rb
@@ -320,6 +320,18 @@ class BlockTest < ActiveSupport::TestCase
     assert block.display_to_user?(user.person)
   end
 
+  should 'display block to environment admins for display_user = members' do
+    community = fast_create(Community)
+    user = create_user('testinguser')
+    community.environment.add_admin(user.person)
+
+    box = fast_create(Box, :owner_id => community.id, :owner_type => 'Community')
+    block = create(Block, :box_id => box.id)
+    block.display_user = 'followers'
+    block.save!
+    assert block.display_to_user?(user.person)
+  end
+
   should 'do not display block to non members of community for display_user = members' do
     community = fast_create(Community)
     user = create_user('testinguser')



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/a0a127434b8e6aa1bcf6a64c6dea9de699089aac

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/a0a127434b8e6aa1bcf6a64c6dea9de699089aac
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180122/fbe032d2/attachment-0001.html>