From eaefb3ea7308112e11b03f8748cf6581c30436a5 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 30 Sep 2013 08:45:19 +0100
Subject: [PATCH] Improve consistency of selections in the browser controller

---
 app/controllers/browse_controller.rb | 24 ++++++++++++------------
 app/models/note.rb                   |  3 +++
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index fc23ebc1f..0103516ff 100644
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -12,8 +12,8 @@ class BrowseController < ApplicationController
   def relation
     @type = "relation"
     @relation = Relation.find(params[:id])
-    @next = Relation.visible.where("id > ?", @relation.id).order("id ASC").first
-    @prev = Relation.visible.where("id < ?", @relation.id).order("id DESC").first
+    @next = Relation.visible.where("id > ?", @relation.id).order(:id => :asc).first
+    @prev = Relation.visible.where("id < ?", @relation.id).order(:id => :desc).first
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
@@ -28,8 +28,8 @@ class BrowseController < ApplicationController
   def way
     @type = "way"
     @way = Way.preload(:way_tags, :containing_relation_members, :changeset => :user, :nodes => [:node_tags, :ways => :way_tags]).find(params[:id])
-    @next = Way.visible.where("id > ?", @way.id).order("id ASC").first
-    @prev = Way.visible.where("id < ?", @way.id).order("id DESC").first
+    @next = Way.visible.where("id > ?", @way.id).order(:id => :asc).first
+    @prev = Way.visible.where("id < ?", @way.id).order(:id => :desc).first
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
@@ -44,8 +44,8 @@ class BrowseController < ApplicationController
   def node
     @type = "node"
     @node = Node.find(params[:id])
-    @next = Node.visible.where("id > ?", @node.id).order("id ASC").first
-    @prev = Node.visible.where("id < ?", @node.id).order("id DESC").first
+    @next = Node.visible.where("id > ?", @node.id).order(:id => :asc).first
+    @prev = Node.visible.where("id < ?", @node.id).order(:id => :desc).first
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
@@ -66,12 +66,12 @@ class BrowseController < ApplicationController
     @relation_pages, @relations = paginate(:old_relations, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'relation_page')
       
     @title = "#{I18n.t('browse.changeset.title')} | #{@changeset.id}"
-    @next = Changeset.where("id > ?", @changeset.id).order("id ASC").first
-    @prev = Changeset.where("id < ?", @changeset.id).order("id DESC").first
+    @next = Changeset.where("id > ?", @changeset.id).order(:id => :asc).first
+    @prev = Changeset.where("id < ?", @changeset.id).order(:id => :desc).first
 
     if @changeset.user.data_public?
-      @next_by_user = Changeset.where("user_id = ? AND id > ?", @changeset.user_id, @changeset.id).order("id ASC").first
-      @prev_by_user = Changeset.where("user_id = ? AND id < ?", @changeset.user_id, @changeset.id).order("id DESC").first
+      @next_by_user = @changeset.user.changesets.where("id > ?", @changeset.id).order(:id => :asc).first
+      @prev_by_user = @changeset.user.changesets.where("id < ?", @changeset.id).order(:id => :desc).first
     end
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
@@ -81,8 +81,8 @@ class BrowseController < ApplicationController
     @type = "note"
     @note = Note.find(params[:id])
     @title = "#{I18n.t('browse.note.title')} | #{@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
+    @next = Note.visible.where("id > ?", @note.id).order(:id => :asc).first
+    @prev = Note.visible.where("id < ?", @note.id).order(:id => :desc).first
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
diff --git a/app/models/note.rb b/app/models/note.rb
index 9dc122721..27357e58a 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -11,6 +11,9 @@ class Note < ActiveRecord::Base
   validates_inclusion_of :status, :in => ["open", "closed", "hidden"]
   validate :validate_position
 
+  scope :visible, -> { where("status != 'hidden'") }
+  scope :invisible, -> { where("status = 'hidden'") }
+
   after_initialize :set_defaults
 
   # Sanity check the latitude and longitude and add an error if it's broken
-- 
2.43.2