Download as
Browse Code »

Commit 329fd76358172cc32531dc7865f9305dec11c3f7

Authored by Larissa Reis
1 parent ff47b46d
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

blog: fixes duplication of blog image cover in blog page 

Fixes #150
Showing 2 changed files with 11 additions and 1 deletions   Show diff stats
app/views/content_viewer/view_page.html.erb
  Diff comments   View file @329fd76
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 <% cache(@page.cache_key(params, user, language)) do %> 31 <% cache(@page.cache_key(params, user, language)) do %>
32 <div class="<%="article-body article-body-" + @page.css_class_name %>"> 32 <div class="<%="article-body article-body-" + @page.css_class_name %>">
33 <% options = @page.image? ? {:gallery_view => true} : {} %> 33 <% options = @page.image? ? {:gallery_view => true} : {} %>
34 - <% if @page.image.present? && !@page.event? %> 34 + <% if @page.image.present? && !@page.event? && !@page.blog? %>
35 <div class="article-body-img"> 35 <div class="article-body-img">
36 <%= image_tag(@page.image.public_filename) %> 36 <%= image_tag(@page.image.public_filename) %>
37 <p><%= @page.image.label%></p> 37 <p><%= @page.image.label%></p>
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @329fd76
@@ -1616,4 +1616,14 @@ class ContentViewerControllerTest &lt; ActionController::TestCase @@ -1616,4 +1616,14 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
1616 page.reload 1616 page.reload
1617 assert_equal 1, page.hits 1617 assert_equal 1, page.hits
1618 end 1618 end
  1619 +
  1620 + should 'show blog image only inside blog cover' do
  1621 + blog = create(Blog, :profile_id => profile.id, :name=>'testblog', :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')})
  1622 + blog.save!
  1623 + get :view_page, :profile => profile.identifier, :page => [blog.path]
  1624 +
  1625 + assert_select '.blog-cover > img', 1
  1626 + assert_select '.article-body-img > img', 0
  1627 + end
  1628 +
1619 end 1629 end