diff --git a/app/models/uploaded_file.rb b/app/models/uploaded_file.rb index 3aec60b..f90fbd3 100644 --- a/app/models/uploaded_file.rb +++ b/app/models/uploaded_file.rb @@ -4,7 +4,7 @@ # of the file itself is kept. (FIXME?) class UploadedFile < Article - track_actions :upload_image, :after_create, :keep_params => ["view_url", "thumbnail_path", "parent.url", "parent.name"], :if => Proc.new { |a| a.published? && a.image? && !a.parent.nil? && a.parent.gallery? }, :custom_target => :parent + track_actions :upload_image, :after_create, :keep_params => ["view_url", "thumbnail_path", "parent.url", "parent.name"], :if => Proc.new { |a| a.published? && a.image? && !a.parent.nil? && a.parent.gallery? }, :custom_target => :action_tracker_target include ShortFilename @@ -25,7 +25,7 @@ class UploadedFile < Article end def thumbnail_path - self.image? ? self.full_filename(:thumb).gsub(File.join(RAILS_ROOT, 'public'), '') : nil + self.image? ? self.full_filename(:display).gsub(File.join(RAILS_ROOT, 'public'), '') : nil end def display_title diff --git a/app/views/profile/_profile_scrap.rhtml b/app/views/profile/_profile_scrap.rhtml index 7ab3128..dd9db38 100644 --- a/app/views/profile/_profile_scrap.rhtml +++ b/app/views/profile/_profile_scrap.rhtml @@ -2,7 +2,7 @@
<%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %>
- <% comment_balloon :class => 'profile-activity-description' do %> +

<%= link_to scrap.sender.name, scrap.sender.url %>

<%= txt2html scrap.content %>

<%= time_ago_as_sentence(scrap.created_at) %>

@@ -13,7 +13,7 @@ <% end %> <%= link_to_remote(content_tag(:span, _('Remove')), :confirm => _('Are you sure?'), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-activity-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %> - <% end %> +