From cfffced652d1a9a02c1fbadc3ded03c9d043f3c7 Mon Sep 17 00:00:00 2001 From: alexs Date: Thu, 15 Aug 2013 16:33:41 +1000 Subject: [PATCH] Fixed the bug in the enterprise geo search. --- app/controllers/enterprises_controller.rb | 4 ++-- app/models/enterprise.rb | 2 +- app/views/enterprises/search.html.haml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/enterprises_controller.rb b/app/controllers/enterprises_controller.rb index 348f385982..f61b432f4d 100644 --- a/app/controllers/enterprises_controller.rb +++ b/app/controllers/enterprises_controller.rb @@ -47,8 +47,8 @@ class EnterprisesController < BaseController def search @suburb = Suburb.find(params[:suburb_id]) if params[:suburb_id].present? - @enterpsises = Enterprise.find_near(@suburb) - @enterprises_json = @enterpsises.to_gmaps4rails + @enterprises = Enterprise.find_near(@suburb).limit(10) + @enterprises_json = @enterprises.to_gmaps4rails render :layout => "landing_page" end end diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb index 4379788dfc..a739ac0003 100644 --- a/app/models/enterprise.rb +++ b/app/models/enterprise.rb @@ -76,7 +76,7 @@ class Enterprise < ActiveRecord::Base enterprises = [] unless suburb.nil? - addresses = Spree::Address.near([suburb.latitude, suburb.longitude], ENTERPRISE_SEARCH_RADIUS, :units => :km).limit(10) + addresses = Spree::Address.near([suburb.latitude, suburb.longitude], ENTERPRISE_SEARCH_RADIUS, :units => :km).joins(:enterprise) enterprises = addresses.collect(&:enterprise) end diff --git a/app/views/enterprises/search.html.haml b/app/views/enterprises/search.html.haml index 551de0f6fa..f2f2dc9e67 100644 --- a/app/views/enterprises/search.html.haml +++ b/app/views/enterprises/search.html.haml @@ -1,4 +1,4 @@ -- if @enterpsises.any? +- if @enterprises.any? .row.full-width .large-4.columns - if @suburb.present? @@ -7,7 +7,7 @@ You have searched at: %strong %div= "#{@suburb.name}, #{@suburb.state_name}" - - @enterpsises.each do |enterprise| + - @enterprises.each do |enterprise| .row.search-result.with-separator .large-12.columns = link_to enterprise.name, shop_front_enterprise_path(enterprise.id)