noosfero | 2 new commits pushed to repository

[Antonio Terceiro]

Antonio Terceiro pushed to refs/heads/master at <a href="https://gitlab.com/noosfero/noosfero">Noosfero / noosfero</a>

Commits:
<a href="https://gitlab.com/noosfero/noosfero/commit/2b2a906cabdcdc326ab8da98d980f47db0f243a8">2b2a906c</a> by Gabriela Navarro
When the block was from an environment it breaks the show to followers option

  - add the checking to be sure that the owner of the block isn't
    Environment

Signed-off-by: Gabriela Navarro <navarro1703 at gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr at gmail.com>

- - - - -
<a href="https://gitlab.com/noosfero/noosfero/commit/2b336e038fc5673d89d948814077b67501e2eab0">2b336e03</a> by Antonio Terceiro
Merge branch 'fix_block_environment' into 'master'

Fix block environment

When the owner of the block is Environment it breaks the edition of the block because of the show to followers new option.

See merge request !434

- - - - -


Changes:

=====================================
app/models/block.rb
=====================================
--- a/app/models/block.rb
+++ b/app/models/block.rb
@@ -224,7 +224,7 @@ class Block < ActiveRecord::Base
       'all'            => _('All users'),
       'logged'         => _('Logged'),
       'not_logged'     => _('Not logged'),
-      'followers'      => owner.organization? ? _('Members') : _('Friends')
+      'followers'      => owner.class != Environment && owner.organization? ? _('Members') : _('Friends')
     }
   end
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150127/daded537/attachment.html>