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

Improve consistency of selections in the browser controller

Browse source
This commit is contained in:
Tom Hughes 2013-09-30 08:45:19 +01:00
parent 536d80c2b2
commit eaefb3ea73
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/controllers/browse_controller.rb
View file

@ -12,8 +12,8 @@ class BrowseController < ApplicationController
def relation def relation
@type = "relation" @type = "relation"
@relation = Relation.find(params[:id]) @relation = Relation.find(params[:id])
@next = Relation.visible.where("id > ?", @relation.id).order("id ASC").first @next = Relation.visible.where("id > ?", @relation.id).order(:id => :asc).first
@prev = Relation.visible.where("id < ?", @relation.id).order("id DESC").first @prev = Relation.visible.where("id < ?", @relation.id).order(:id => :desc).first
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
render :action => "not_found", :status => :not_found render :action => "not_found", :status => :not_found
end end
@ -28,8 +28,8 @@ class BrowseController < ApplicationController
def way def way
@type = "way" @type = "way"
@way = Way.preload(:way_tags, :containing_relation_members, :changeset => :user, :nodes => [:node_tags, :ways => :way_tags]).find(params[:id]) @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 @next = Way.visible.where("id > ?", @way.id).order(:id => :asc).first
@prev = Way.visible.where("id < ?", @way.id).order("id DESC").first @prev = Way.visible.where("id < ?", @way.id).order(:id => :desc).first
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
render :action => "not_found", :status => :not_found render :action => "not_found", :status => :not_found
end end
@ -44,8 +44,8 @@ class BrowseController < ApplicationController
def node def node
@type = "node" @type = "node"
@node = Node.find(params[:id]) @node = Node.find(params[:id])
@next = Node.visible.where("id > ?", @node.id).order("id ASC").first @next = Node.visible.where("id > ?", @node.id).order(:id => :asc).first
@prev = Node.visible.where("id < ?", @node.id).order("id DESC").first @prev = Node.visible.where("id < ?", @node.id).order(:id => :desc).first
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
render :action => "not_found", :status => :not_found render :action => "not_found", :status => :not_found
end 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') @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}" @title = "#{I18n.t('browse.changeset.title')} | #{@changeset.id}"
@next = Changeset.where("id > ?", @changeset.id).order("id ASC").first @next = Changeset.where("id > ?", @changeset.id).order(:id => :asc).first
@prev = Changeset.where("id < ?", @changeset.id).order("id DESC").first @prev = Changeset.where("id < ?", @changeset.id).order(:id => :desc).first
if @changeset.user.data_public? if @changeset.user.data_public?
@next_by_user = Changeset.where("user_id = ? AND id > ?", @changeset.user_id, @changeset.id).order("id ASC").first @next_by_user = @changeset.user.changesets.where("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 @prev_by_user = @changeset.user.changesets.where("id < ?", @changeset.id).order(:id => :desc).first
end end
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
render :action => "not_found", :status => :not_found render :action => "not_found", :status => :not_found
@ -81,8 +81,8 @@ class BrowseController < ApplicationController
@type = "note" @type = "note"
@note = Note.find(params[:id]) @note = Note.find(params[:id])
@title = "#{I18n.t('browse.note.title')} | #{@note.id}" @title = "#{I18n.t('browse.note.title')} | #{@note.id}"
@next = Note.where("status != 'hidden' AND id > ?", @note.id).order(:id).first @next = Note.visible.where("id > ?", @note.id).order(:id => :asc).first
@prev = Note.where("status != 'hidden' AND id < ?", @note.id).order(:id => :desc).first @prev = Note.visible.where("id < ?", @note.id).order(:id => :desc).first
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
render :action => "not_found", :status => :not_found render :action => "not_found", :status => :not_found
end end

3
app/models/note.rb
View file

@ -11,6 +11,9 @@ class Note < ActiveRecord::Base
validates_inclusion_of :status, :in => ["open", "closed", "hidden"] validates_inclusion_of :status, :in => ["open", "closed", "hidden"]
validate :validate_position validate :validate_position
scope :visible, -> { where("status != 'hidden'") }
scope :invisible, -> { where("status = 'hidden'") }
after_initialize :set_defaults after_initialize :set_defaults
# Sanity check the latitude and longitude and add an error if it's broken # Sanity check the latitude and longitude and add an error if it's broken