Download as
Browse Code »

Commit 48b50f8829052e384c1c78ba70051fb70c72d716

Authored by Arthur Esposte
1 parent 70d40ab5
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Consider subdirectory in some images path 

Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @48b50f8
@@ -809,7 +809,7 @@ class Article &lt; ActiveRecord::Base @@ -809,7 +809,7 @@ class Article &lt; ActiveRecord::Base
809 end 809 end
810 810
811 def first_image 811 def first_image
812 - img = ( image.present? && { 'src' => image.public_filename } ) || 812 + img = ( image.present? && { 'src' => File.join([Noosfero.root, image.public_filename].join) } ) ||
813 Nokogiri::HTML.fragment(self.lead.to_s).css('img[src]').first || 813 Nokogiri::HTML.fragment(self.lead.to_s).css('img[src]').first ||
814 Nokogiri::HTML.fragment(self.body.to_s).search('img').first 814 Nokogiri::HTML.fragment(self.body.to_s).search('img').first
815 img.nil? ? '' : img['src'] 815 img.nil? ? '' : img['src']
app/views/cms/media_panel/_image.html.erb
  Diff comments   View file @48b50f8
1 <div class="item image" data-item="span" title="<%= @file.name %>"> 1 <div class="item image" data-item="span" title="<%= @file.name %>">
2 <span> 2 <span>
3 - <img src="<%= @file.public_filename(:uploaded) %>"/> 3 + <%= image_tag(@file.public_filename(:uploaded)) %>
4 </span> 4 </span>
5 <div class="controls image-controls"> 5 <div class="controls image-controls">
6 <a class="button icon-add add-to-text" href="#"><span><%= _('Add to the text') %></span></a> 6 <a class="button icon-add add-to-text" href="#"><span><%= _('Add to the text') %></span></a>