Convert some deprecated methods to modern arel syntax

[rails.git] / app / controllers / browse_controller.rb

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 47d902a30a10547252e3d91e2bf43cf1ca8dabaa..705078be7ba36e08a146b1c715130e7ad4ed13ca 100644 (file)
--- 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}"
     @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
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end