Download as
Browse Code »

Commit d3ade2770098e468309a816a17045627d56ec2fa

Authored by Antonio Terceiro
1 parent 536e6100
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

ChatController: fix assumption about default avatar

Showing 2 changed files with 8 additions and 5 deletions   Show diff stats
app/controllers/public/chat_controller.rb
  Diff comments   View file @d3ade27
... ... @@ -19,9 +19,13 @@ class ChatController < PublicController
19 19 def avatar
20 20 profile = environment.profiles.find_by_identifier(params[:id])
21 21 filename, mimetype = profile_icon(profile, :minor, true)
22   - data = File.read(File.join(Rails.root, 'public', filename))
23   - render :text => data, :layout => false, :content_type => mimetype
24   - expires_in 24.hours
  22 + if filename =~ /^https?:/
  23 + redirect_to filename
  24 + else
  25 + data = File.read(File.join(Rails.root, 'public', filename))
  26 + render :text => data, :layout => false, :content_type => mimetype
  27 + expires_in 24.hours
  28 + end
25 29 end
26 30  
27 31 def index
... ...
test/functional/chat_controller_test.rb
  Diff comments   View file @d3ade27
... ... @@ -26,8 +26,7 @@ class ChatControllerTest < ActionController::TestCase
26 26  
27 27 get :avatar, :id => 'testuser'
28 28  
29   - assert_equal 'image/png', @response.content_type
30   - assert @response.body.index('PNG')
  29 + assert_response :redirect
31 30 end
32 31  
33 32 should 'get avatar from community' do
... ...