From 554a7c9d47613cf486589f9e5e8023629713c7fe Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 29 Sep 2013 22:50:01 +0100 Subject: [PATCH] Convert some deprecated methods to modern arel syntax --- app/controllers/browse_controller.rb | 4 ++-- app/models/trace.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 47d902a30..705078be7 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -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 diff --git a/app/models/trace.rb b/app/models/trace.rb index 5394ca01d..df66496a2 100644 --- a/app/models/trace.rb +++ b/app/models/trace.rb @@ -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 -- 2.39.5