Download as
Browse Code »

Commit 8cf420af67192aecfab090c7b7b3b078e0df80e3

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

Resisting unexisting domains for getting map keys

Showing 2 changed files with 11 additions and 2 deletions   Show diff stats
app/models/google_maps.rb
  Diff comments   View file @8cf420a
@@ -19,8 +19,9 @@ class GoogleMaps @@ -19,8 +19,9 @@ class GoogleMaps
19 domain ? !domain.google_maps_key.nil? : false 19 domain ? !domain.google_maps_key.nil? : false
20 end 20 end
21 21
22 - def key(domain)  
23 - Domain.find_by_name(domain).google_maps_key || '' 22 + def key(domainname)
  23 + domain = Domain.find_by_name(domainname)
  24 + domain && domain.google_maps_key || ''
24 end 25 end
25 26
26 def initial_zoom 27 def initial_zoom
test/unit/google_maps_test.rb
  Diff comments   View file @8cf420a
@@ -44,4 +44,12 @@ class GoogleMapsTest < Test::Unit::TestCase @@ -44,4 +44,12 @@ class GoogleMapsTest < Test::Unit::TestCase
44 assert_equal 'http://maps.google.com/maps?file=api&v=2&key=DOMAIN_KEY', GoogleMaps.api_url(domain.name) 44 assert_equal 'http://maps.google.com/maps?file=api&v=2&key=DOMAIN_KEY', GoogleMaps.api_url(domain.name)
45 assert_equal 'http://maps.google.com/maps?file=api&v=2&key=DIFFERENT_DOMAIN_KEY', GoogleMaps.api_url(other_domain.name) 45 assert_equal 'http://maps.google.com/maps?file=api&v=2&key=DIFFERENT_DOMAIN_KEY', GoogleMaps.api_url(other_domain.name)
46 end 46 end
  47 +
  48 + should 'not crash without a domain' do
  49 + Domain.delete_all
  50 + assert_nothing_raised do
  51 + GoogleMaps.key('example.com')
  52 + end
  53 + end
  54 +
47 end 55 end