Merge branch 'private-notifications' into 'master'

profile-activities: generate and filter private notifications Notifications of private profiles or provite contents were not being generated. This patch generates these notifications and filter activities being displayed to the user according to her/his permissions. Making this work through pure sql is just too complex. It was needed to filter results after pagination, for performance reasons, and perform some workarounds to not mess with the paginated results. See merge request !1009

Merge branch 'private-notifications' into 'master'
profile-activities: generate and filter private notifications Notifications of private profiles or provite contents were not being generated. This patch generates these notifications and filter activities being displayed to the user according to her/his permissions. Making this work through pure sql is just too complex. It was needed to filter results after pagination, for performance reasons, and perform some workarounds to not mess with the paginated results. See merge request !1009
Rodrigo Souto
2 parents 9f3246db 18ac7d64
Showing 34 changed files with 488 additions and 336 deletions Show diff stats
app/controllers/public/profile_controller.rb
app/jobs/notify_activity_to_profiles_job.rb
app/models/article.rb
app/models/favorite_enterprise_person.rb
app/models/profile.rb
app/models/scrap.rb
app/models/uploaded_file.rb
app/presenters/activity/generic.rb
app/presenters/activity_presenter.rb
app/presenters/file/generic.rb
app/presenters/file/image.rb
app/presenters/file_presenter.rb
app/presenters/generic.rb
app/presenters/image.rb
app/views/file_presenter/_image.html.erb
app/views/profile/_default_activity.html.erb
app/views/profile/_favorite_enterprise.html.erb
app/views/profile/_leave_scrap.html.erb
app/views/profile/_profile_activities_list.html.erb
app/views/profile/_profile_network.html.erb
@@ -13,17 +13,13 @@ class ProfileController &lt; PublicController
   protect 'send_mail_to_members', :profile, :only => [:send_mail]
-  def index
-    @network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) : []
-    if logged_in? && current_person.follows?(@profile)
-      @network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) if @network_activities.empty?
-      @activities = @profile.activities.paginate(:per_page => 15, :page => params[:page])
-    end
-
-    # TODO Find a way to filter these through sql
-    @network_activities = filter_private_scraps(@network_activities)
-    @activities = filter_private_scraps(@activities)
+  ACTIVITIES_PER_PAGE = 15
+  def index
+    @offsets = {:wall => 0, :network => 0}
+    page = (params[:page] || 1).to_i
+    @network_activities = loop_fetch_activities(@profile.tracked_notifications, :network, page) if !@profile.is_a?(Person) || follow_profile?
+    @activities = loop_fetch_activities(@profile.activities, :wall, page) if follow_profile?
     @tags = profile.article_tags
     allow_access_to_page
   end
@@ -255,7 +251,7 @@ class ProfileController &lt; PublicController
       render :partial => 'profile_activities_list', :locals => {:activities => activities}
     else
       network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page])
-      render :partial => 'profile_network_activities', :locals => {:network_activities => network_activities}
+      render :partial => 'profile_network_activities', :locals => {:activities => network_activities}
     end
   end
@@ -267,14 +263,32 @@ class ProfileController &lt; PublicController
     render :text => prepare_to_token_input_by_class(result).to_json
   end
-  def view_more_activities
-    @activities = @profile.activities.paginate(:per_page => 10, :page => params[:page])
-    render :partial => 'profile_activities_list', :locals => {:activities => @activities}
+  def loop_fetch_activities(base_activities, kind, page)
+    activities = nil
+    while activities.nil? || (activities.empty? && page <= activities.total_pages)
+      activities = base_activities.offset(@offsets[kind.to_sym]).paginate(:per_page => ACTIVITIES_PER_PAGE, :page => page)
+      activities = filter_activities(activities, kind.to_sym)
+      page += 1
+    end
+    activities
   end
-  def view_more_network_activities
-    @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page])
-    render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}
+  def view_more_activities
+    @activities = nil
+    @offsets = params[:offsets]
+    page = (params[:page] || 1).to_i
+    kind = params[:kind]
+
+    if kind == 'wall'
+      base_activities = @profile.activities
+      partial = 'profile_activities_list'
+    else
+      base_activities = @profile.tracked_notifications
+      partial = 'profile_network_activities'
+    end
+
+    @activities = loop_fetch_activities(base_activities, kind, page)
+    render :partial => partial, :locals => {:activities => @activities}
   end
   def more_comments
@@ -510,22 +524,22 @@ class ProfileController &lt; PublicController
     followed.uniq
   end
-  def filter_private_scraps(activities)
+  def filter_activities(activities, kind)
+    @offsets ||= {:wall => 0, :network => 0}
+    return activities if environment.admins.include?(user)
     activities = Array(activities)
-    activities.delete_if do |item|
-      if item.kind_of?(ProfileActivity)
-        target = item.activity
-        owner = profile
-      else
-        target = item.target
-        owner = item.user
-      end
-      !environment.admins.include?(user) &&
-      owner != user &&
-      target.is_a?(Scrap) &&
-      target.marked_people.present? &&
-      !target.marked_people.include?(user)
-    end
+    initial_count = activities.count
+    activities.delete_if do |activity|
+      activity = ActivityPresenter.for(activity)
+      next if activity.involved?(user)
+      activity.hidden_for?(user)
+    end
+    @offsets[kind] = @offsets[kind].to_i
+    @offsets[kind] += initial_count - activities.count
     activities
   end
+
+  def follow_profile?
+    logged_in? && current_person.follows?(@profile)
+  end
 end
@@ -11,7 +11,7 @@ class NotifyActivityToProfilesJob &lt; Struct.new(:tracked_action_id)
     tracked_action = ActionTracker::Record.find(tracked_action_id)
     return unless tracked_action.user.present?
     target = tracked_action.target
-    if target.is_a?(Community) && ( NOTIFY_ONLY_COMMUNITY.include?(tracked_action.verb) || ! target.public_profile )
+    if target.is_a?(Community) && NOTIFY_ONLY_COMMUNITY.include?(tracked_action.verb)
       ActionTrackerNotification.create(:profile_id => target.id, :action_tracker_id => tracked_action.id)
       return
     end
@@ -63,7 +63,7 @@ class Article &lt; ApplicationRecord
     _('Content')
   end
-  track_actions :create_article, :after_create, :keep_params => [:name, :url, :lead, :first_image], :if => Proc.new { |a| a.is_trackable? && !a.image? }
+  track_actions :create_article, :after_create, :keep_params => [:name, :url, :lead, :first_image], :if => Proc.new { |a| a.notifiable? }
   # xss_terminate plugin can't sanitize array fields
   # sanitize_tag_list is used with SanitizeHelper
@@ -183,10 +183,6 @@ class Article &lt; ApplicationRecord
     end
   end
-  def is_trackable?
-    self.published? && self.notifiable? && self.advertise? && self.profile.public_profile
-  end
-
   def external_link=(link)
     if !link.blank? && link !~ /^[a-z]+:\/\//i
       link = 'http://' + link
@@ -845,7 +841,7 @@ class Article &lt; ApplicationRecord
   end
   def create_activity
-    if is_trackable? && !image?
+    if notifiable? && !image?
       save_action_for_verb 'create_article', [:name, :url, :lead, :first_image], Proc.new{}, :author
     end
   end
@@ -2,7 +2,7 @@ class FavoriteEnterprisePerson &lt; ApplicationRecord
   attr_accessible :person, :enterprise
-  track_actions :favorite_enterprise, :after_create, keep_params: [:enterprise_name, :enterprise_url], if: proc{ |f| f.is_trackable? }
+  track_actions :favorite_enterprise, :after_create, keep_params: [:enterprise_name, :enterprise_url], if: proc{ |f| f.notifiable? }
   belongs_to :enterprise
   belongs_to :person
@@ -13,7 +13,7 @@ class FavoriteEnterprisePerson &lt; ApplicationRecord
   protected
-  def is_trackable?
+  def notifiable?
     self.enterprise.public?
   end
@@ -824,13 +824,14 @@ private :generate_url, :url_options
   # returns +true+ if the given +user+ can see profile information about this
   # +profile+, and +false+ otherwise.
-  def display_info_to?(user)
+  def display_info_to?(user = nil)
     if self.public?
       true
     else
       display_private_info_to?(user)
     end
   end
+  alias_method :display_to?, :display_info_to?
   after_save :update_category_from_region
   def update_category_from_region
@@ -67,6 +67,10 @@ class Scrap &lt; ApplicationRecord
     sender != receiver && (is_root? ? root.receiver.receives_scrap_notification? : receiver.receives_scrap_notification?)
   end
+  def display_to?(user = nil)
+    marked_people.blank? || marked_people.include?(user)
+  end
+
   protected
   def create_activity
@@ -190,8 +190,12 @@ class UploadedFile &lt; Article
     true
   end
+  def image?
+    mime_type =~ /^image\//
+  end
+
   def notifiable?
-    true
+    !image?
   end
 end
@@ -0,0 +1,5 @@
+class ActivityPresenter::Generic < ActivityPresenter
+  def self.accepts?(instance)
+    1
+  end
+end
@@ -0,0 +1,44 @@
+class ActivityPresenter < Presenter
+  def self.base_class
+    ActionTracker::Record
+  end
+
+  def self.available?(instance)
+    instance.kind_of?(ActionTracker::Record) || instance.kind_of?(ProfileActivity)
+  end
+
+  def self.target(instance)
+    if instance.kind_of?(ProfileActivity)
+      target(instance.activity)
+    elsif instance.kind_of?(ActionTracker::Record)
+       instance.target
+    else
+      instance
+    end
+  end
+
+  def self.owner(instance)
+    instance.kind_of?(ProfileActivity) ? instance.profile : instance.user
+  end
+
+  def target
+    self.class.target(encapsulated_instance)
+  end
+
+  def owner
+    self.class.owner(encapsulated_instance)
+  end
+
+  def hidden_for?(user)
+    target.respond_to?(:display_to?) && !target.display_to?(user)
+  end
+
+  def involved?(user)
+    owner == user || target == user
+  end
+end
+
+# Preload ActivityPresenter subclasses to allow `Presenter.for()` to work
+Dir.glob(File.join('app', 'presenters', 'activity', '*.rb')) do |file|
+  load file
+end
@@ -0,0 +1,7 @@
+# Made to encapsulate any UploadedFile
+class FilePresenter::Generic < FilePresenter
+  # if returns low priority, because it is generic.
+  def self.accepts?(f)
+    1 if f.is_a? UploadedFile
+  end
+end
@@ -0,0 +1,23 @@
+class FilePresenter::Image < FilePresenter
+  def self.accepts?(f)
+    return nil unless f.respond_to? :image?
+    f.image? ? 10 : nil
+  end
+
+  def sized_icon(size)
+    public_filename size
+  end
+
+  def icon_name
+    public_filename :icon
+  end
+
+  def short_description
+    _('Image (%s)') % content_type.split('/')[1].upcase
+  end
+
+  #Overwriting method from FilePresenter to allow download of images
+  def download?(view = nil)
+    view.blank? || view == 'false'
+  end
+end
@@ -0,0 +1,80 @@
+class FilePresenter < Presenter
+  def self.base_class
+    Article
+  end
+
+  def self.available?(instance)
+    instance.kind_of?(UploadedFile) && !instance.kind_of?(Image)
+  end
+
+  def download? view = nil
+    view.blank?
+  end
+
+  def short_description
+    file_type = if content_type.present?
+      content_type.sub(/^application\//, '').sub(/^x-/, '').sub(/^image\//, '')
+    else
+      _('Unknown')
+    end
+    _("File (%s)") % file_type
+  end
+
+  # Define the css classes to style the page fragment with the file related
+  # content. If you want other classes to identify this area to your
+  # customized presenter, so do this:
+  #   def css_class_list
+  #     [super, 'myclass'].flatten
+  #   end
+  def css_class_list
+    [ encapsulated_instance.css_class_list,
+      'file-' + self.class.to_s.split(/:+/).map(&:underscore)[1..-1].join('-'),
+      'content-type_' + self.content_type.split('/')[0],
+      'content-type_' + self.content_type.gsub(/[^a-z0-9]/i,'-')
+    ].flatten
+  end
+
+  # Enable file presenter to customize the css classes on view_page.rhtml
+  # You may not overwrite this method on your customized presenter.
+  def css_class_name
+    [css_class_list].flatten.compact.join(' ')
+  end
+
+  # The generic icon class-name or the specific file path.
+  # You may replace this method on your custom FilePresenter.
+  # See the current used icons class-names in public/designs/icons/tango/style.css
+  def icon_name
+    if mime_type
+      [ mime_type.split('/')[0], mime_type.gsub(/[^a-z0-9]/i, '-') ]
+    else
+      'upload-file'
+    end
+  end
+
+  # Automatic render `file_presenter/<custom>.html.erb` to display your
+  # custom presenter html content.
+  # You may not overwrite this method on your customized presenter.
+  # A variable with the same presenter name will be created to refer
+  # to the file object.
+  # Example:
+  # The `FilePresenter::Image` render `file_presenter/image.html.erb`
+  # inside the `file_presenter/image.html.erb` you can access the
+  # required `FilePresenter::Image` instance in the `image` variable.
+  def to_html(options = {})
+    file = self
+    proc do
+      render :partial => file.class.to_s.underscore,
+             :locals => { :options => options },
+             :object => file
+    end
+  end
+end
+
+Dir.glob(File.join('app', 'presenters', 'file', '*.rb')) do |file|
+  load file
+end
+
+# Preload FilePresenters from plugins to allow `FilePresenter.for()` to work
+Dir.glob(File.join('plugins', '*', 'lib', 'presenters', '*.rb')) do |file|
+  load file
+end
@@ -1,7 +0,0 @@
-# Made to encapsulate any UploadedFile
-class FilePresenter::Generic < FilePresenter
-  # if returns low priority, because it is generic.
-  def self.accepts?(f)
-    1 if f.is_a? UploadedFile
-  end
-end
@@ -1,23 +0,0 @@
-class FilePresenter::Image < FilePresenter
-  def self.accepts?(f)
-    return nil unless f.respond_to? :image?
-    f.image? ? 10 : nil
-  end
-
-  def sized_icon(size)
-    public_filename size
-  end
-
-  def icon_name
-    public_filename :icon
-  end
-
-  def short_description
-    _('Image (%s)') % content_type.split('/')[1].upcase
-  end
-
-  #Overwriting method from FilePresenter to allow download of images
-  def download?(view = nil)
-    view.blank? || view == 'false'
-  end
-end
 <% if image.gallery? && options[:gallery_view] %>
 <%
   images = image.parent.images
-  current_index = images.index(image.encapsulated_file)
+  current_index = images.index(image.encapsulated_instance)
   total_of_images = images.count
   link_to_previous = if current_index >= 1
    link_to(_('&laquo; Previous').html_safe, images[current_index - 1].view_url, :class => 'previous')
@@ -2,7 +2,7 @@
   <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
 </div>
 <div class='profile-activity-description'>
-  <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
+  <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe(activity).html_safe %></p>
   <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
@@ -3,7 +3,7 @@
 </div>
 <div class='profile-activity-description'>
   <p class='profile-activity-text'>
-    <%= link_to activity.user.short_name(nil), activity.user.url %> <%= describe activity %>
+    <%= link_to activity.user.short_name(nil), activity.user.url %> <%= describe(activity).html_safe %>
   </p>
   <p class='profile-activity-time'><%= time_ago_in_words activity.created_at %></p>
@@ -2,7 +2,7 @@
   <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
 </div>
 <div class='profile-activity-description'>
-  <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
+  <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe(activity).html_safe %></p>
   <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
@@ -11,6 +11,6 @@
 <% if activities.current_page < activities.total_pages %>
   <div id='profile_activities_page_<%= activities.current_page %>'>
-    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_activities', :page => (activities.current_page + 1)}, :update => "profile_activities_page_#{activities.current_page}" %>
+    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_activities', :page => (activities.current_page + 1), :offsets => @offsets, :kind => 'wall'}, :update => "profile_activities_page_#{activities.current_page}" %>
   </div>
 <% end %>
 <h3><%= _("%s's network activity") % @profile.name %></h3>
 <ul id='network-activities' class='profile-activities'>
-  <%= render :partial => 'profile_network_activities', :locals => {:network_activities => @network_activities} %>
+  <%= render :partial => 'profile_network_activities', :locals => {:activities => @network_activities} %>
 </ul>
-<% network_activities.each do |activity| %>
+<% activities.each do |activity| %>
   <%= render :partial => 'profile_activity', :locals => { :activity => activity, :tab_action => 'network' } if activity.visible? %>
 <% end %>
-<% if network_activities.current_page < network_activities.total_pages %>
-  <div id='profile_network_activities_page_<%= network_activities.current_page %>'>
-    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_network_activities', :page => (network_activities.current_page + 1)}, :update => "profile_network_activities_page_#{network_activities.current_page}" %>
+<% if activities.current_page < activities.total_pages %>
+  <div id='profile_network_activities_page_<%= activities.current_page %>'>
+    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_activities', :page => (activities.current_page + 1), :offsets => @offsets, :kind => 'network'}, :update => "profile_network_activities_page_#{activities.current_page}" %>
   </div>
 <% end %>
@@ -1,131 +0,0 @@
-# All file presenters must extends `FilePresenter` not only to ensure the
-# same interface, but also to make `FilePresenter.for(file)` to work.
-class FilePresenter
-
-  # Will return a encapsulated `UploadedFile` or the same object if no
-  # one accepts it. That behave allow to give any model to this class,
-  # like a Article and have no trouble with that.
-  def self.for(f)
-    #FIXME This check after the || is redundant but increases the blog_page
-    #      speed considerably.
-    return f if f.is_a?(FilePresenter ) || (!f.kind_of?(UploadedFile) && !f.kind_of?(Image))
-    klass = FilePresenter.subclasses.sort_by {|class_instance|
-      class_instance.accepts?(f) || 0
-    }.last
-    klass.accepts?(f) ? klass.new(f) : f
-  end
-
-  def self.base_class
-    Article
-  end
-
-  def initialize(f)
-    @file = f
-  end
-
-  # Allows to use the original `UploadedFile` reference.
-  def encapsulated_file
-    @file
-  end
-
-  def id
-    @file.id
-  end
-
-  def reload
-    @file.reload
-    self
-  end
-
-  def kind_of?(klass)
-    @file.kind_of?(klass)
-  end
-
-  # This method must be overridden in subclasses.
-  #
-  # If the class accepts the file, return a number that represents the
-  # priority the class should be given to handle that file. Higher numbers
-  # mean higher priority.
-  #
-  # If the class does not accept the file, return false.
-  def self.accepts?(f)
-    nil
-  end
-
-  def download? view = nil
-    view.blank?
-  end
-
-  def short_description
-    file_type = if content_type.present?
-      content_type.sub(/^application\//, '').sub(/^x-/, '').sub(/^image\//, '')
-    else
-      _('Unknown')
-    end
-    _("File (%s)") % file_type
-  end
-
-  # Define the css classes to style the page fragment with the file related
-  # content. If you want other classes to identify this area to your
-  # customized presenter, so do this:
-  #   def css_class_list
-  #     [super, 'myclass'].flatten
-  #   end
-  def css_class_list
-    [ @file.css_class_list,
-      'file-' + self.class.to_s.split(/:+/).map(&:underscore)[1..-1].join('-'),
-      'content-type_' + self.content_type.split('/')[0],
-      'content-type_' + self.content_type.gsub(/[^a-z0-9]/i,'-')
-    ].flatten
-  end
-
-  # Enable file presenter to customize the css classes on view_page.rhtml
-  # You may not overwrite this method on your customized presenter.
-  def css_class_name
-    [css_class_list].flatten.compact.join(' ')
-  end
-
-  # The generic icon class-name or the specific file path.
-  # You may replace this method on your custom FilePresenter.
-  # See the current used icons class-names in public/designs/icons/tango/style.css
-  def icon_name
-    if mime_type
-      [ mime_type.split('/')[0], mime_type.gsub(/[^a-z0-9]/i, '-') ]
-    else
-      'upload-file'
-    end
-  end
-
-  # Automatic render `file_presenter/<custom>.html.erb` to display your
-  # custom presenter html content.
-  # You may not overwrite this method on your customized presenter.
-  # A variable with the same presenter name will be created to refer
-  # to the file object.
-  # Example:
-  # The `FilePresenter::Image` render `file_presenter/image.html.erb`
-  # inside the `file_presenter/image.html.erb` you can access the
-  # required `FilePresenter::Image` instance in the `image` variable.
-  def to_html(options = {})
-    file = self
-    proc do
-      render :partial => file.class.to_s.underscore,
-             :locals => { :options => options },
-             :object => file
-    end
-  end
-
-  # That makes the presenter to works like any other `UploadedFile` instance.
-  def method_missing(m, *args)
-    @file.send(m, *args)
-  end
-end
-
-# Preload FilePresenters to allow `FilePresenter.for()` to work
-Dir.glob(File.join('app', 'presenters', '*.rb')) do |file|
-  load file
-end
-
-# Preload FilePresenters from plugins to allow `FilePresenter.for()` to work
-Dir.glob(File.join('plugins', '*', 'lib', 'presenters', '*.rb')) do |file|
-  load file
-end
@@ -0,0 +1,63 @@
+class Presenter
+  # Define presenter base_class
+  def self.base_class
+  end
+
+  # Define base type condition
+  def self.available?(instance)
+    false
+  end
+
+  def self.for(instance)
+    return instance if instance.is_a?(Presenter) || !available?(instance)
+
+    klass = subclasses.sort_by {|class_instance|
+      class_instance.accepts?(instance) || 0
+    }.last
+
+    klass.accepts?(instance) ? klass.new(instance) : f
+  end
+
+  def initialize(instance)
+    @instance = instance
+  end
+
+  # Allows to use the original instance reference.
+  def encapsulated_instance
+    @instance
+  end
+
+  def id
+    @instance.id
+  end
+
+  def reload
+    @instance.reload
+    self
+  end
+
+  def kind_of?(klass)
+    @instance.kind_of?(klass)
+  end
+
+  # This method must be overridden in subclasses.
+  #
+  # If the class accepts the instance, return a number that represents the
+  # priority the class should be given to handle that instance. Higher numbers
+  # mean higher priority.
+  #
+  # If the class does not accept the instance, return false.
+  def self.accepts?(f)
+    nil
+  end
+
+  # That makes the presenter to works like any other not encapsulated instance.
+  def method_missing(m, *args)
+    @instance.send(m, *args)
+  end
+end
+
+# Preload Presenters to allow `Presenter.for()` to work
+Dir.glob(File.join('app', 'presenters', '*.rb')) do |file|
+  load file
+end
@@ -8,8 +8,8 @@ class MetadataPlugin::Controllers
     lambda do
       if profile and @page and profile.home_page_id == @page.id
         @profile
-      elsif @page.respond_to? :encapsulated_file
-        @page.encapsulated_file
+      elsif @page.respond_to? :encapsulated_instance
+        @page.encapsulated_instance
       else
         @page
       end
@@ -48,9 +48,9 @@ class ProductsPlugin::Product &lt; ApplicationRecord
   extend ActsAsHavingSettings::ClassMethods
   acts_as_having_settings field: :data
-  track_actions :create_product, :after_create, keep_params: [:name, :url ], if: Proc.new { |a| a.is_trackable? }, custom_user: :action_tracker_user
-  track_actions :update_product, :before_update, keep_params: [:name, :url], if: Proc.new { |a| a.is_trackable? }, custom_user: :action_tracker_user
-  track_actions :remove_product, :before_destroy, keep_params: [:name], if: Proc.new { |a| a.is_trackable? }, custom_user: :action_tracker_user
+  track_actions :create_product, :after_create, keep_params: [:name, :url ], if: Proc.new { |a| a.notifiable? }, custom_user: :action_tracker_user
+  track_actions :update_product, :before_update, keep_params: [:name, :url], if: Proc.new { |a| a.notifiable? }, custom_user: :action_tracker_user
+  track_actions :remove_product, :before_destroy, keep_params: [:name], if: Proc.new { |a| a.notifiable? }, custom_user: :action_tracker_user
   validates_uniqueness_of :name, scope: :profile_id, allow_nil: true, if: :validate_uniqueness_of_column_name?
@@ -290,7 +290,7 @@ class ProductsPlugin::Product &lt; ApplicationRecord
     true
   end
-  def is_trackable?
+  def notifiable?
     # shopping_cart create products without profile
     self.profile.present?
   end
@@ -888,17 +888,17 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(profile.identifier)
     ActionTracker::Record.delete_all
     get :index, :profile => p1.identifier
-    assert_equal [], assigns(:network_activities)
+    assert assigns(:network_activities).blank?
     assert_response :success
     assert_template 'index'
     get :index, :profile => p2.identifier
-    assert_equal [], assigns(:network_activities)
+    assert assigns(:network_activities).blank?
     assert_response :success
     assert_template 'index'
     get :index, :profile => p3.identifier
-    assert_equal [], assigns(:network_activities)
+    assert assigns(:network_activities).blank?
     assert_response :success
     assert_template 'index'
   end
@@ -1186,14 +1186,14 @@ class ProfileControllerTest &lt; ActionController::TestCase
     40.times{ create(ActionTracker::Record, :user_id => profile.id, :user_type => 'Profile', :verb => 'create_article', :target_id => article.id, :target_type => 'Article', :params => {'name' => article.name, 'url' => article.url, 'lead' => article.lead, 'first_image' => article.first_image})}
     assert_equal 40, profile.tracked_actions.count
     assert_equal 40, profile.activities.size
-    get :view_more_activities, :profile => profile.identifier, :page => 2
+    get :view_more_activities, :profile => profile.identifier, :page => 2, :kind => 'wall', :offsets => {:wall => 0, :network => 0}
     assert_response :success
     assert_template '_profile_activities_list'
-    assert_equal 10, assigns(:activities).size
+    assert_equal ProfileController::ACTIVITIES_PER_PAGE, assigns(:activities).size
   end
   should "be logged in to access the view_more_activities action" do
-    get :view_more_activities, :profile => profile.identifier
+    get :view_more_activities, :profile => profile.identifier, :kind => 'wall', :offsets => {:wall => 0, :network => 0}
     assert_redirected_to :controller => 'account', :action => 'login'
   end
@@ -1201,14 +1201,14 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(profile.identifier)
     40.times{fast_create(ActionTrackerNotification, :profile_id => profile.id, :action_tracker_id => fast_create(ActionTracker::Record, :user_id => profile.id)) }
     assert_equal 40, profile.tracked_notifications.count
-    get :view_more_network_activities, :profile => profile.identifier, :page => 2
+    get :view_more_activities, :profile => profile.identifier, :page => 2, :kind => 'network', :offsets => {:wall => 0, :network => 0}
     assert_response :success
     assert_template '_profile_network_activities'
-    assert_equal 10, assigns(:activities).size
+    assert_equal ProfileController::ACTIVITIES_PER_PAGE, assigns(:activities).size
   end
   should "be logged in to access the view_more_network_activities action" do
-    get :view_more_network_activities, :profile => profile.identifier
+    get :view_more_activities, :profile => profile.identifier, :kind => 'network', :offsets => {:wall => 0, :network => 0}
     assert_redirected_to :controller => 'account', :action => 'login'
   end
@@ -2260,4 +2260,47 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert assigns(:network_activities).include?(scrap_activity)
   end
+  should 'not filter any activity if the user is an environment admin' do
+    admin = create_user('env-admin').person
+    env = @profile.environment
+    env.add_admin(admin)
+    activities = mock
+    activities.expects(:delete_if).never
+    @controller.stubs(:user).returns(admin)
+    @controller.stubs(:environment).returns(env)
+    @controller.send(:filter_activities, activities, :wall)
+  end
+
+  should 'not call hidden_for? if the user is involved in the activity' do
+    user = create_user('involved-user').person
+    env = @profile.environment
+    activity = mock
+    activities = [activity]
+    activity.stubs(:involved?).with(user).returns(true)
+    activity.expects(:hidden_for?).never
+    @controller.stubs(:user).returns(user)
+    @controller.stubs(:environment).returns(env)
+    result = @controller.send(:filter_activities, activities, :wall)
+    assert_includes result, activity
+  end
+
+  should 'remove activities that should be hidden for the user' do
+    user = create_user('sample-user').person
+    env = @profile.environment
+    a1 = mock
+    a2 = mock
+    a3 = mock
+    activities = [a1, a2, a3]
+    a1.stubs(:involved?).with(user).returns(false)
+    a2.stubs(:involved?).with(user).returns(false)
+    a3.stubs(:involved?).with(user).returns(false)
+    a1.stubs(:hidden_for?).with(user).returns(false)
+    a2.stubs(:hidden_for?).with(user).returns(true)
+    a3.stubs(:hidden_for?).with(user).returns(false)
+    @controller.stubs(:user).returns(user)
+    @controller.stubs(:environment).returns(env)
+    result = @controller.send(:filter_activities, activities, :wall)
+    assert_equivalent [a1,a3], result
+  end
+
 end
@@ -0,0 +1,16 @@
+require_relative "../../test_helper"
+
+class ActivityPresenter::GenericTest < ActiveSupport::TestCase
+  should 'accept everything' do
+    activity = ActionTracker::Record.new
+
+    activity.stubs(:target).returns(Profile.new)
+    assert ActivityPresenter::Generic.accepts?(activity)
+    activity.stubs(:target).returns(Article.new)
+    assert ActivityPresenter::Generic.accepts?(activity)
+    activity.stubs(:target).returns(Scrap.new)
+    assert ActivityPresenter::Generic.accepts?(activity)
+    activity.stubs(:target).returns(mock)
+    assert ActivityPresenter::Generic.accepts?(activity)
+  end
+end
@@ -0,0 +1,86 @@
+require_relative "../test_helper"
+
+class ActivityPresenterTest < ActiveSupport::TestCase
+  should 'be available for ActionTracker::Record' do
+    assert ActivityPresenter.available?(ActionTracker::Record.new)
+  end
+
+  should 'be available for ProfileActivity' do
+    assert ActivityPresenter.available?(ProfileActivity.new)
+  end
+
+  should 'return correct target for ActionTracker::Record' do
+    target = mock
+    activity = ActionTracker::Record.new
+    activity.stubs(:target).returns(target)
+    assert_equal target, ActivityPresenter.target(activity)
+  end
+
+  should 'return correct target for ProfileActivity' do
+    target = mock
+    notification = ProfileActivity.new
+    record = ActionTracker::Record.new
+    notification.stubs(:activity).returns(record)
+    record.stubs(:target).returns(target)
+
+    assert_equal target, ActivityPresenter.target(notification)
+  end
+
+  should 'return correct owner for ActionTracker::Record' do
+    owner = mock
+    activity = ActionTracker::Record.new
+    activity.stubs(:user).returns(owner)
+    assert_equal owner, ActivityPresenter.owner(activity)
+  end
+
+  should 'return correct owner for ProfileActivity' do
+    owner = mock
+    notification = ProfileActivity.new
+    notification.stubs(:profile).returns(owner)
+
+    assert_equal owner, ActivityPresenter.owner(notification)
+  end
+
+  should 'not be hidden for user if target does not respond to display_to' do
+    user = fast_create(Person)
+    target = mock
+    presenter = ActivityPresenter.new(target)
+    refute presenter.hidden_for?(user)
+  end
+
+  should 'be hidden for user based on target display_to' do
+    user = fast_create(Person)
+    target = mock
+    presenter = ActivityPresenter.new(target)
+
+    target.stubs(:display_to?).with(user).returns(false)
+    assert presenter.hidden_for?(user)
+
+    target.stubs(:display_to?).with(user).returns(true)
+    refute presenter.hidden_for?(user)
+  end
+
+  should 'verify if user is involved as target with the activity' do
+    user = mock
+    presenter = ActivityPresenter.new(mock)
+    presenter.stubs(:target).returns(user)
+    presenter.stubs(:owner).returns(nil)
+    assert presenter.involved?(user)
+  end
+
+  should 'verify if user is involved as owner with the activity' do
+    user = mock
+    presenter = ActivityPresenter.new(mock)
+    presenter.stubs(:target).returns(nil)
+    presenter.stubs(:owner).returns(user)
+    assert presenter.involved?(user)
+  end
+
+  should 'refute if user is not involved' do
+    user = mock
+    presenter = ActivityPresenter.new(mock)
+    presenter.stubs(:target).returns(nil)
+    presenter.stubs(:owner).returns(nil)
+    refute presenter.involved?(user)
+  end
+end
@@ -319,13 +319,6 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
     assert_equal approved_article, ActionTracker::Record.last.target
   end
-  should "have the same is_trackable method as original article" do
-    a = create(ApproveArticle, :article => article, :target => community, :requestor => profile)
-    a.finish
-
-    assert_equal article.is_trackable?, article.class.last.is_trackable?
-  end
-
   should 'not have target notification message if it is not a moderated oganization' do
     community.moderated_articles = false; community.save
     task = build(ApproveArticle, :article => article, :target => community, :requestor => profile)
@@ -1044,34 +1044,6 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal profile, article.action_tracker_target
   end
-  should "have defined the is_trackable method defined" do
-    assert Article.method_defined?(:is_trackable?)
-  end
-
-  should "the common trackable conditions return the correct value" do
-    a =  Article.new
-    a.published = a.advertise = true
-    assert_equal true, a.published?
-    assert_equal false, a.notifiable?
-    assert_equal true, a.advertise?
-    assert_equal false, a.is_trackable?
-
-    a.published=false
-    assert_equal false, a.published?
-    assert_equal false, a.is_trackable?
-
-    a.published=true
-    a.advertise=false
-    assert_equal false, a.advertise?
-    assert_equal false, a.is_trackable?
-  end
-
-  should "not be trackable if article is inside a private community" do
-    private_community = fast_create(Community, :public_profile => false)
-    a =  fast_create(TextArticle, :profile_id => private_community.id)
-    assert_equal false, a.is_trackable?
-  end
-
   should 'create the notification to organization and all organization members' do
     Profile.destroy_all
     ActionTracker::Record.destroy_all
@@ -73,10 +73,11 @@ class NotifyActivityToProfilesJobTest &lt; ActiveSupport::TestCase
     assert not_marked.tracked_notifications.where(:target => scrap).blank?
   end
-  should 'not notify the communities members' do
+  should 'notify the community members on private articles' do
     person = fast_create(Person)
     community  = fast_create(Community)
-    action_tracker = fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person.id, :target_type => 'Profile', :target_id => community.id, :verb => 'create_article')
+    article = fast_create(TextArticle, :published => false, :profile_id => community.id)
+    action_tracker = fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person.id, :target_type => 'Article', :target_id => article.id, :verb => 'create_article')
     refute NotifyActivityToProfilesJob::NOTIFY_ONLY_COMMUNITY.include?(action_tracker.verb)
     m1, m2 = fast_create(Person), fast_create(Person), fast_create(Person), fast_create(Person)
     fast_create(RoleAssignment, :accessor_id => m1.id, :role_id => 3, :resource_id => community.id)
@@ -116,7 +117,7 @@ class NotifyActivityToProfilesJobTest &lt; ActiveSupport::TestCase
     end
   end
-  should 'notify only the community if it is private' do
+  should 'notify only the community and its members if it is private' do
     person = fast_create(Person)
     private_community  = fast_create(Community, :public_profile => false)
     action_tracker = fast_create(ActionTracker::Record, :user_type => 'Profile', :user_id => person.id, :target_type => 'Profile', :target_id => private_community.id, :verb => 'create_article')
@@ -131,14 +132,23 @@ class NotifyActivityToProfilesJobTest &lt; ActiveSupport::TestCase
     job.perform
     process_delayed_job_queue
-    assert_equal 1, ActionTrackerNotification.count
-    [person,  p1, p2, m1, m2].each do |profile|
-      notification = ActionTrackerNotification.find_by profile_id: profile.id
-      assert notification.nil?
-    end
+    assert_equal 4, ActionTrackerNotification.count
+    # Community notification
     notification = ActionTrackerNotification.find_by profile_id: private_community.id
     assert_equal action_tracker, notification.action_tracker
+
+    # User notification
+    notification = ActionTrackerNotification.find_by profile_id: person.id
+    assert_equal action_tracker, notification.action_tracker
+
+    # Community members notifications
+    assert ActionTrackerNotification.find_by profile_id: m1.id
+    assert ActionTrackerNotification.find_by profile_id: m2.id
+
+    # No user friends notification
+    assert_nil ActionTrackerNotification.find_by profile_id: p1.id
+    assert_nil ActionTrackerNotification.find_by profile_id: p2.id
   end
   should 'not notify the community tracking join_community verb' do
@@ -313,4 +313,20 @@ class ScrapTest &lt; ActiveSupport::TestCase
     assert_equal s, p2.activities.first.activity
   end
+  should 'display to anyone if nobody marked' do
+    assert Scrap.new.display_to?(fast_create(Person))
+  end
+
+  should 'display only to marked people' do
+    scrap = Scrap.new
+    u1 = mock
+    u2 = mock
+    u3 = mock
+    scrap.stubs(:marked_people).returns([u1, u3])
+
+    assert scrap.display_to?(u1)
+    refute scrap.display_to?(u2)
+    assert scrap.display_to?(u3)
+  end
+
 end
@@ -97,38 +97,6 @@ class TextArticleTest &lt; ActiveSupport::TestCase
     assert_equal article, ActionTracker::Record.last.target
   end
-  should 'not notify activity if the article is not advertise' do
-    ActionTracker::Record.delete_all
-    a = create TextArticle, name: 'bar', profile_id: profile.id, published: true, advertise: false
-    assert_equal true, a.published?
-    assert_equal true, a.notifiable?
-    assert_equal false, a.image?
-    assert_equal false, a.profile.is_a?(Community)
-    assert_equal 0, ActionTracker::Record.count
-  end
-
-  should "have defined the is_trackable method defined" do
-    assert TextArticle.method_defined?(:is_trackable?)
-  end
-
-  should "the common trackable conditions return the correct value" do
-    a =  build(TextArticle, profile: profile)
-    a.published = a.advertise = true
-    assert_equal true, a.published?
-    assert_equal true, a.notifiable?
-    assert_equal true, a.advertise?
-    assert_equal true, a.is_trackable?
-
-    a.published=false
-    assert_equal false, a.published?
-    assert_equal false, a.is_trackable?
-
-    a.published=true
-    a.advertise=false
-    assert_equal false, a.advertise?
-    assert_equal false, a.is_trackable?
-  end
-
   should 'generate proper HTML for links' do
     assert_tag_in_string build_article('"Noosfero":http://noosfero.org/').to_html, tag: 'a', attributes: { href: 'http://noosfero.org/' }
   end
@@ -162,38 +162,6 @@ class TinyMceArticleTest &lt; ActiveSupport::TestCase
     assert_equal article, ActionTracker::Record.last.target
   end
-  should 'not notify activity if the article is not advertise' do
-    ActionTracker::Record.delete_all
-    a = create TextArticle, name: 'bar', profile_id: profile.id, published: true, advertise: false
-    assert_equal true, a.published?
-    assert_equal true, a.notifiable?
-    assert_equal false, a.image?
-    assert_equal false, a.profile.is_a?(Community)
-    assert_equal 0, ActionTracker::Record.count
-  end
-
-  should "have defined the is_trackable method defined" do
-    assert TextArticle.method_defined?(:is_trackable?)
-  end
-
-  should "the common trackable conditions return the correct value" do
-    a =  build(TextArticle, :profile => profile)
-    a.published = a.advertise = true
-    assert_equal true, a.published?
-    assert_equal true, a.notifiable?
-    assert_equal true, a.advertise?
-    assert_equal true, a.is_trackable?
-
-    a.published=false
-    assert_equal false, a.published?
-    assert_equal false, a.is_trackable?
-
-    a.published=true
-    a.advertise=false
-    assert_equal false, a.advertise?
-    assert_equal false, a.is_trackable?
-  end
-
   should 'not sanitize html5 audio tag on body' do
     article = TextArticle.create!(:name => 'html5 audio', :body => "Audio: <audio controls='controls'><source src='http://example.ogg' type='audio/ogg' />Audio not playing?.</audio>", :profile => profile)
     assert_tag_in_string article.body, :tag => 'audio', :attributes => {:controls => 'controls'}
	@@ -11,7 +11,7 @@ class NotifyActivityToProfilesJob < Struct.new(:tracked_action_id)		@@ -11,7 +11,7 @@ class NotifyActivityToProfilesJob < Struct.new(:tracked_action_id)
11	tracked_action = ActionTracker::Record.find(tracked_action_id)	11	tracked_action = ActionTracker::Record.find(tracked_action_id)
12	return unless tracked_action.user.present?	12	return unless tracked_action.user.present?
13	target = tracked_action.target	13	target = tracked_action.target
14	- if target.is_a?(Community) && ( NOTIFY_ONLY_COMMUNITY.include?(tracked_action.verb) \|\| ! target.public_profile )	14	+ if target.is_a?(Community) && NOTIFY_ONLY_COMMUNITY.include?(tracked_action.verb)
15	ActionTrackerNotification.create(:profile_id => target.id, :action_tracker_id => tracked_action.id)	15	ActionTrackerNotification.create(:profile_id => target.id, :action_tracker_id => tracked_action.id)
16	return	16	return
17	end	17	end
	@@ -2,7 +2,7 @@ class FavoriteEnterprisePerson < ApplicationRecord		@@ -2,7 +2,7 @@ class FavoriteEnterprisePerson < ApplicationRecord
2		2
3	attr_accessible :person, :enterprise	3	attr_accessible :person, :enterprise
4		4
5	- track_actions :favorite_enterprise, :after_create, keep_params: [:enterprise_name, :enterprise_url], if: proc{ \|f\| f.is_trackable? }	5	+ track_actions :favorite_enterprise, :after_create, keep_params: [:enterprise_name, :enterprise_url], if: proc{ \|f\| f.notifiable? }
6		6
7	belongs_to :enterprise	7	belongs_to :enterprise
8	belongs_to :person	8	belongs_to :person
	@@ -13,7 +13,7 @@ class FavoriteEnterprisePerson < ApplicationRecord		@@ -13,7 +13,7 @@ class FavoriteEnterprisePerson < ApplicationRecord
13		13
14	protected	14	protected
15		15
16	- def is_trackable?	16	+ def notifiable?
17	self.enterprise.public?	17	self.enterprise.public?
18	end	18	end
19		19
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class ActivityPresenter::Generic < ActivityPresenter
	2	+ def self.accepts?(instance)
	3	+ 1
	4	+ end
	5	+end
@@ -0,0 +1,44 @@		@@ -0,0 +1,44 @@
	1	+class ActivityPresenter < Presenter
	2	+ def self.base_class
	3	+ ActionTracker::Record
	4	+ end
	5	+
	6	+ def self.available?(instance)
	7	+ instance.kind_of?(ActionTracker::Record) \|\| instance.kind_of?(ProfileActivity)
	8	+ end
	9	+
	10	+ def self.target(instance)
	11	+ if instance.kind_of?(ProfileActivity)
	12	+ target(instance.activity)
	13	+ elsif instance.kind_of?(ActionTracker::Record)
	14	+ instance.target
	15	+ else
	16	+ instance
	17	+ end
	18	+ end
	19	+
	20	+ def self.owner(instance)
	21	+ instance.kind_of?(ProfileActivity) ? instance.profile : instance.user
	22	+ end
	23	+
	24	+ def target
	25	+ self.class.target(encapsulated_instance)
	26	+ end
	27	+
	28	+ def owner
	29	+ self.class.owner(encapsulated_instance)
	30	+ end
	31	+
	32	+ def hidden_for?(user)
	33	+ target.respond_to?(:display_to?) && !target.display_to?(user)
	34	+ end
	35	+
	36	+ def involved?(user)
	37	+ owner == user \|\| target == user
	38	+ end
	39	+end
	40	+
	41	+# Preload ActivityPresenter subclasses to allow `Presenter.for()` to work
	42	+Dir.glob(File.join('app', 'presenters', 'activity', '*.rb')) do \|file\|
	43	+ load file
	44	+end
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+# Made to encapsulate any UploadedFile
	2	+class FilePresenter::Generic < FilePresenter
	3	+ # if returns low priority, because it is generic.
	4	+ def self.accepts?(f)
	5	+ 1 if f.is_a? UploadedFile
	6	+ end
	7	+end
@@ -0,0 +1,23 @@		@@ -0,0 +1,23 @@
	1	+class FilePresenter::Image < FilePresenter
	2	+ def self.accepts?(f)
	3	+ return nil unless f.respond_to? :image?
	4	+ f.image? ? 10 : nil
	5	+ end
	6	+
	7	+ def sized_icon(size)
	8	+ public_filename size
	9	+ end
	10	+
	11	+ def icon_name
	12	+ public_filename :icon
	13	+ end
	14	+
	15	+ def short_description
	16	+ _('Image (%s)') % content_type.split('/')[1].upcase
	17	+ end
	18	+
	19	+ #Overwriting method from FilePresenter to allow download of images
	20	+ def download?(view = nil)
	21	+ view.blank? \|\| view == 'false'
	22	+ end
	23	+end
@@ -0,0 +1,80 @@		@@ -0,0 +1,80 @@
	1	+class FilePresenter < Presenter
	2	+ def self.base_class
	3	+ Article
	4	+ end
	5	+
	6	+ def self.available?(instance)
	7	+ instance.kind_of?(UploadedFile) && !instance.kind_of?(Image)
	8	+ end
	9	+
	10	+ def download? view = nil
	11	+ view.blank?
	12	+ end
	13	+
	14	+ def short_description
	15	+ file_type = if content_type.present?
	16	+ content_type.sub(/^application\//, '').sub(/^x-/, '').sub(/^image\//, '')
	17	+ else
	18	+ _('Unknown')
	19	+ end
	20	+ _("File (%s)") % file_type
	21	+ end
	22	+
	23	+ # Define the css classes to style the page fragment with the file related
	24	+ # content. If you want other classes to identify this area to your
	25	+ # customized presenter, so do this:
	26	+ # def css_class_list
	27	+ # [super, 'myclass'].flatten
	28	+ # end
	29	+ def css_class_list
	30	+ [ encapsulated_instance.css_class_list,
	31	+ 'file-' + self.class.to_s.split(/:+/).map(&:underscore)[1..-1].join('-'),
	32	+ 'content-type_' + self.content_type.split('/')[0],
	33	+ 'content-type_' + self.content_type.gsub(/[^a-z0-9]/i,'-')
	34	+ ].flatten
	35	+ end
	36	+
	37	+ # Enable file presenter to customize the css classes on view_page.rhtml
	38	+ # You may not overwrite this method on your customized presenter.
	39	+ def css_class_name
	40	+ [css_class_list].flatten.compact.join(' ')
	41	+ end
	42	+
	43	+ # The generic icon class-name or the specific file path.
	44	+ # You may replace this method on your custom FilePresenter.
	45	+ # See the current used icons class-names in public/designs/icons/tango/style.css
	46	+ def icon_name
	47	+ if mime_type
	48	+ [ mime_type.split('/')[0], mime_type.gsub(/[^a-z0-9]/i, '-') ]
	49	+ else
	50	+ 'upload-file'
	51	+ end
	52	+ end
	53	+
	54	+ # Automatic render `file_presenter/<custom>.html.erb` to display your
	55	+ # custom presenter html content.
	56	+ # You may not overwrite this method on your customized presenter.
	57	+ # A variable with the same presenter name will be created to refer
	58	+ # to the file object.
	59	+ # Example:
	60	+ # The `FilePresenter::Image` render `file_presenter/image.html.erb`
	61	+ # inside the `file_presenter/image.html.erb` you can access the
	62	+ # required `FilePresenter::Image` instance in the `image` variable.
	63	+ def to_html(options = {})
	64	+ file = self
	65	+ proc do
	66	+ render :partial => file.class.to_s.underscore,
	67	+ :locals => { :options => options },
	68	+ :object => file
	69	+ end
	70	+ end
	71	+end
	72	+
	73	+Dir.glob(File.join('app', 'presenters', 'file', '*.rb')) do \|file\|
	74	+ load file
	75	+end
	76	+
	77	+# Preload FilePresenters from plugins to allow `FilePresenter.for()` to work
	78	+Dir.glob(File.join('plugins', '', 'lib', 'presenters', '.rb')) do \|file\|
	79	+ load file
	80	+end
	@@ -1,7 +0,0 @@	@@ -1,7 +0,0 @@
1	-# Made to encapsulate any UploadedFile
2	-class FilePresenter::Generic < FilePresenter
3	- # if returns low priority, because it is generic.
4	- def self.accepts?(f)
5	- 1 if f.is_a? UploadedFile
6	- end
7	-end
	@@ -1,23 +0,0 @@	@@ -1,23 +0,0 @@
1	-class FilePresenter::Image < FilePresenter
2	- def self.accepts?(f)
3	- return nil unless f.respond_to? :image?
4	- f.image? ? 10 : nil
5	- end
6	-
7	- def sized_icon(size)
8	- public_filename size
9	- end
10	-
11	- def icon_name
12	- public_filename :icon
13	- end
14	-
15	- def short_description
16	- _('Image (%s)') % content_type.split('/')[1].upcase
17	- end
18	-
19	- #Overwriting method from FilePresenter to allow download of images
20	- def download?(view = nil)
21	- view.blank? \|\| view == 'false'
22	- end
23	-end
1	<% if image.gallery? && options[:gallery_view] %>	1	<% if image.gallery? && options[:gallery_view] %>
2	<%	2	<%
3	images = image.parent.images	3	images = image.parent.images
4	- current_index = images.index(image.encapsulated_file)	4	+ current_index = images.index(image.encapsulated_instance)
5	total_of_images = images.count	5	total_of_images = images.count
6	link_to_previous = if current_index >= 1	6	link_to_previous = if current_index >= 1
7	link_to(_('« Previous').html_safe, images[current_index - 1].view_url, :class => 'previous')	7	link_to(_('« Previous').html_safe, images[current_index - 1].view_url, :class => 'previous')