[Git][noosfero/noosfero][master] 2 commits: followers: every member is considered a follower

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
a884dce4 by Rodrigo Souto at 2016-12-05T16:53:39-03:00
followers: every member is considered a follower

- - - - -
3f3c5e2a by Rodrigo Souto at 2016-12-16T16:57:33+00:00
Merge branch 'member-as-follower' into 'master'

followers: every member is considered a follower

See merge request !1064
- - - - -


1 changed file:

- app/models/profile.rb


Changes:

=====================================
app/models/profile.rb
=====================================
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -1148,7 +1148,7 @@ private :generate_url, :url_options
   end
 
   def followed_by?(person)
-    (person == self) || (person.in? self.followers)
+    (person == self) || (person.is_member_of?(self)) || (person.in? self.followers)
   end
 
   def in_social_circle?(person)



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/e1b0170c0a7d1710337b7392cdcdd0ba665dbbc3...3f3c5e2afc30c801fd3f9e04c0ee0c1631c2fc8d
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20161216/f8e9144b/attachment-0001.html>