cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert some deprecated methods to modern arel syntax

Browse source
This commit is contained in:
Tom Hughes 2013-09-29 22:50:01 +01:00
parent 63100ae8a0
commit 554a7c9d47
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/browse_controller.rb
View file

@ -81,8 +81,8 @@ class BrowseController < ApplicationController
@type = "note"
@note = Note.find(params[:id])
@title = "#{I18n.t('browse.note.title')} | #{@note.id}"
@next = Note.find(:first, :order => "id ASC", :conditions => [ "status != 'hidden' AND id > :id", { :id => @note.id }] )
@prev = Note.find(:first, :order => "id DESC", :conditions => [ "status != 'hidden' AND id < :id", { :id => @note.id }] )
@next = Note.where("status != 'hidden' AND id > ?", @note.id).order(:id).first
@prev = Note.where("status != 'hidden' AND id < ?", @note.id).order(:id => @desc).first
rescue ActiveRecord::RecordNotFound
render :action => "not_found", :status => :not_found
end

8
app/models/trace.rb
View file

@ -289,10 +289,10 @@ class Trace < ActiveRecord::Base
end
if gpx.actual_points > 0
max_lat = Tracepoint.maximum('latitude', :conditions => ['gpx_id = ?', id])
min_lat = Tracepoint.minimum('latitude', :conditions => ['gpx_id = ?', id])
max_lon = Tracepoint.maximum('longitude', :conditions => ['gpx_id = ?', id])
min_lon = Tracepoint.minimum('longitude', :conditions => ['gpx_id = ?', id])
max_lat = Tracepoint.where(:gpx_id => id).maximum(:latitude)
min_lat = Tracepoint.where(:gpx_id => id).minimum(:latitude)
max_lon = Tracepoint.where(:gpx_id => id).maximum(:longitude)
min_lon = Tracepoint.where(:gpx_id => id).minimum(:longitude)
max_lat = max_lat.to_f / 10000000
min_lat = min_lat.to_f / 10000000