Download as
Browse Code »

Commit 72790af069f65a3a0ab0113d0a7ac2fa99322d0a

Authored by Arthur Esposte
1 parent 5da04adb
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

AI3131 - fixing bug in add image to articles, header and footer

Showing 2 changed files with 16 additions and 0 deletions   Show diff stats
app/presenters/image.rb
  Diff comments   View file @72790af
... ... @@ -11,4 +11,8 @@ class FilePresenter::Image < FilePresenter
11 11 def short_description
12 12 _('Image (%s)') % content_type.split('/')[1].upcase
13 13 end
  14 +
  15 + def download? view = nil
  16 + view.blank? || view == 'false'
  17 + end
14 18 end
... ...
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @72790af
... ... @@ -75,6 +75,18 @@ class ContentViewerControllerTest < ActionController::TestCase
75 75 assert_match /#{html.public_filename}/, @response.body
76 76 end
77 77  
  78 + should 'produce a download-link when article is a image' do
  79 + profile = create_user('someone').person
  80 + image = UploadedFile.create! :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :profile => profile
  81 + image.save!
  82 +
  83 + get :view_page, :profile => 'someone', :page => [ 'rails.png' ]
  84 +
  85 + assert_response :success
  86 + assert_not_nil assigns(:page).data
  87 + assert_match /image/, @response.headers['Content-Type']
  88 + end
  89 +
78 90 should 'produce a download-link when article is not text/html' do
79 91  
80 92 # for example, RSS feeds
... ...