Download as
Browse Code »

Commit a9dcd2e683200f96b88c092b0a46ae40b3fdaa83

Authored by Rafael Martins
1 parent bf622985
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

Fix for the map search not showing the products correctly

Showing 2 changed files with 3 additions and 11 deletions   Show diff stats
app/views/search/_google_maps.rhtml
  Diff comments   View file @a9dcd2e
@@ -3,28 +3,20 @@ @@ -3,28 +3,20 @@
3 <div id="map"></div> 3 <div id="map"></div>
4 </div> 4 </div>
5 5
6 -<%= content_tag('script', '', :src => GoogleMaps.api_url(environment.default_hostname), :type => 'text/javascript') %> 6 +<%= content_tag('script', '', :src => "http://maps.google.com/maps/api/js?sensor=true", :type => 'text/javascript') %>
7 <%= javascript_include_tag('google_maps') %> 7 <%= javascript_include_tag('google_maps') %>
8 8
9 <% 9 <%
10 icon = default_or_themed_icon("/images/icons-map/enterprise.png") 10 icon = default_or_themed_icon("/images/icons-map/enterprise.png")
11 - icon_shadow = default_or_themed_icon("/images/icons-map/enterprise_shadow.png")  
12 %> 11 %>
13 12
14 <script type='text/javascript'> 13 <script type='text/javascript'>
15 mapLoad(<%= GoogleMaps.initial_zoom.to_json %>); 14 mapLoad(<%= GoogleMaps.initial_zoom.to_json %>);
16 15
17 - mapBaseIcon = new GIcon();  
18 - mapBaseIcon.iconSize=new GSize(32,32);  
19 - mapBaseIcon.shadowSize=new GSize(36,32);  
20 - mapBaseIcon.iconAnchor=new GPoint(16,32);  
21 - mapBaseIcon.infoWindowAnchor=new GPoint(16,0);  
22 - icon = new GIcon(mapBaseIcon, "<%= icon %>", null, "<%= icon_shadow %>");  
23 -  
24 <% @results.each do |name,results| %> 16 <% @results.each do |name,results| %>
25 <% results.each do |item| %> 17 <% results.each do |item| %>
26 <% if item.lat && item.lng %> 18 <% if item.lat && item.lng %>
27 - mapPutMarker(<%= item.lat.to_json %>, <%= item.lng.to_json %>, <%= item.name.to_json %>, icon, 19 + mapPutMarker(<%= item.lat.to_json %>, <%= item.lng.to_json %>, <%= item.name.to_json %>, '<%= icon %>',
28 '<%= url_for(:controller => :map_balloon, :action => name.to_s.singularize, :id => item.id) %>'); 20 '<%= url_for(:controller => :map_balloon, :action => name.to_s.singularize, :id => item.id) %>');
29 <% end %> 21 <% end %>
30 <% end %> 22 <% end %>
app/views/search/_product.rhtml
  Diff comments   View file @a9dcd2e
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 3
4 <li class="search-product-item"> 4 <li class="search-product-item">
5 <div class="search-product-item-first-column"> 5 <div class="search-product-item-first-column">
6 - <%= render :partial => 'image', :object => product %> 6 + <%= render :partial => 'search/image', :object => product %>
7 7
8 <% if product.available %> 8 <% if product.available %>
9 <% if product.price && product.price > 0 %> 9 <% if product.price && product.price > 0 %>