diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb
index 3e599e4..7692064 100644
--- a/app/controllers/public/search_controller.rb
+++ b/app/controllers/public/search_controller.rb
@@ -120,7 +120,11 @@ class SearchController < ApplicationController
# TODO: dont hardcore like this
def limit
searching = @searching.values.select{|v|v}
- (searching.size == 1) ? 10 : 6
+ if params[:display] == 'map'
+ 100
+ else
+ (searching.size == 1) ? 20 : 6
+ end
end
public
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index b73eced..06b74f3 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -41,9 +41,9 @@ module SearchHelper
def display_item_map_info(item)
if item.kind_of?(Profile)
- display_profile_info
+ display_profile_info(item)
elsif item.kind_of?(Product)
- display_product_info
+ display_product_info(item)
end
end
@@ -77,6 +77,24 @@ module SearchHelper
)
end
+ def display_product_info(product)
+ data = ''
+ unless product.price.nil?
+ data << content_tag('strong', _('Price: ')) + product.price + '
'
+ end
+ unless product.enterprise.nil?
+ data << content_tag('strong', _('Provider: ')) + link_to_profile(product.enterprise.name, product.enterprise.identifier)
+ end
+ unless product.product_category.nil?
+ data << content_tag('strong', _('Category: ')) + link_to(product.product_category.name, :controller => 'search', :action => 'assets', :asset => 'products', :product_category => product.product_category.id)
+ end
+ content_tag('table',
+ content_tag('tr',
+ content_tag('td', content_tag('div', image_tag(product.image ? product.image.public_filename(:thumb) : '/images/icons-app/product-default-pic-portrait.png'), :class => 'profile-info-picture')) +
+ content_tag('td', content_tag('strong', link_to(product.name, :controller => 'catalog', :profile => product.enterprise.identifier, :action => 'show', :id => product)) + '
' + data)
+ ), :class => 'profile-info')
+ end
+
def pagination_links(collection, options={})
options = {:prev_label => '« ' + _('Previous'), :next_label => _('Next') + ' »'}.merge(options)
will_paginate(collection, options)
diff --git a/app/views/search/_google_maps.rhtml b/app/views/search/_google_maps.rhtml
index 439fdd1..1a464ef 100644
--- a/app/views/search/_google_maps.rhtml
+++ b/app/views/search/_google_maps.rhtml
@@ -56,7 +56,7 @@ if (GBrowserIsCompatible()) {
results.each do |item|
if item.lat && item.lng
%>
- putMarker(<%= item.lat.to_json %>, <%= item.lng.to_json %>, <%= item.name.to_json %>, <%= display_profile_info(item).to_json %>);
+ putMarker(<%= item.lat.to_json %>, <%= item.lng.to_json %>, <%= item.name.to_json %>, <%= display_item_map_info(item).to_json %>);
<%
else
missed = true
--
libgit2 0.21.2