diff --git a/app/models/article.rb b/app/models/article.rb index f62769c..4cb47a4 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -150,7 +150,7 @@ class Article < ActiveRecord::Base if user.nil? false else - (user == self.profile) || user.memberships.include?(self.profile) + (user == self.profile) || user.memberships.include?(self.profile) || (profile.kind_of?(Person) && profile.friends.include?(user)) end end end diff --git a/app/models/person.rb b/app/models/person.rb index 78ac739..61a7da0 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -93,4 +93,12 @@ class Person < Profile ['%s@%s' % [self.identifier, self.environment.default_hostname ] ] end + def display_info_to?(user) + if friends.include?(user) + true + else + super + end + end + end diff --git a/app/views/profile_editor/edit.rhtml b/app/views/profile_editor/edit.rhtml index fdfe34d..e174caf 100644 --- a/app/views/profile_editor/edit.rhtml +++ b/app/views/profile_editor/edit.rhtml @@ -24,17 +24,40 @@ <%= _('Private') %>
-- <%= _("This profile's content is:") %> -
<%= _('Public') %> | <%= _('Private') %> | |
---|---|---|
<%= _('Activate Intranet access (restricted area only for me)') %> | <%= _('Yes') %> | <%= _('Yes') %> | +
<%= _('Show my website to all internet users') %> | <%= _('Yes') %> | <%= _('No') %> | +
<%= _('Show my website to my contacts (persons)') %> | <%= _('Yes') %> | <%= _('Yes') %> | +
<%= _('Include my contact in directory of people') %> | <%= _('Yes') %> | <%= _('No') %> | +
<%= _('Public') %> | <%= _('Private') %> | |
---|---|---|
<%= _('Activate Intranet access (restricted area only for members)') %> | <%= _('Yes') %> | <%= _('Yes') %> | +
<%= _('Show website of this group to all internet users') %> | <%= _('Yes') %> | <%= _('No') %> | +
<%= _('Show my website to members') %> | <%= _('Yes') %> | <%= _('Yes') %> | +
<%= _('Include this group directory of groups') %> | <%= _('Yes') %> | <%= _('No') %> | +