choteaumt
/
adopt-a-hydrant
mirror of https://github.com/choteaumt/adopt-a-hydrant.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set default limit to 40

This commit is contained in:
Erik Michaels-Ober 2011-09-15 21:18:06 -07:00
parent d8cd38690b
commit 9ea3d90227
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/things_controller.rb
View File

@ -2,7 +2,7 @@ class ThingsController < ApplicationController
respond_to :json respond_to :json
def show def show
@things = Thing.find_closest(params[:lat], params[:lng], params[:limit] || 20) @things = Thing.find_closest(params[:lat], params[:lng], params[:limit] || 40)
unless @things.blank? unless @things.blank?
respond_with @things respond_with @things
else else

2
app/models/thing.rb
View File

@ -4,7 +4,7 @@ class Thing < ActiveRecord::Base
belongs_to :user belongs_to :user
has_many :reminders has_many :reminders
def self.find_closest(lat, lng, limit=20) def self.find_closest(lat, lng, limit=40)
query = <<-SQL query = <<-SQL
SELECT *, (3959 * ACOS(COS(RADIANS(?)) * COS(RADIANS(lat)) * COS(radians(lng) - RADIANS(?)) + SIN(RADIANS(?)) * SIN(RADIANS(lat)))) AS distance SELECT *, (3959 * ACOS(COS(RADIANS(?)) * COS(RADIANS(lat)) * COS(radians(lng) - RADIANS(?)) + SIN(RADIANS(?)) * SIN(RADIANS(lat)))) AS distance
FROM things FROM things

2
app/views/main/index.html.haml
View File

@ -8,7 +8,7 @@
= select_tag "city_state", "<option value=\"#{t("defaults.city")}\" selected=\"selected\">#{t("defaults.city")}</option>".html_safe, :tabindex => 10 = select_tag "city_state", "<option value=\"#{t("defaults.city")}\" selected=\"selected\">#{t("defaults.city")}</option>".html_safe, :tabindex => 10
= label_tag "address", t("labels.address"), :id => "address_label" = label_tag "address", t("labels.address"), :id => "address_label"
= text_field_tag "address", params[:address], :tabindex => 11 = text_field_tag "address", params[:address], :tabindex => 11
= hidden_field_tag "limit", params[:limit] || 20 = hidden_field_tag "limit", params[:limit] || 40
= submit_tag t("buttons.find", :thing => t("defaults.thing").pluralize), :tabindex => 12 = submit_tag t("buttons.find", :thing => t("defaults.thing").pluralize), :tabindex => 12
#logos #logos
= image_tag "logos/cfa.png", :alt => t("sponsors.cfa"), :title => t("sponsors.cfa") = image_tag "logos/cfa.png", :alt => t("sponsors.cfa"), :title => t("sponsors.cfa")