X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bd1bf189fb67eb1f56bafe4c39d05cc7b4aea472..bd053a060a6a4e68f84ce4a9c6c41f2268b9b667:/app/controllers/changesets_controller.rb?ds=sidebyside diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb index 613a3ee2a..6a80f260a 100644 --- a/app/controllers/changesets_controller.rb +++ b/app/controllers/changesets_controller.rb @@ -4,7 +4,6 @@ class ChangesetsController < ApplicationController include UserMethods layout "site" - require "xml/libxml" before_action :authorize_web before_action :set_locale @@ -16,9 +15,6 @@ class ChangesetsController < ApplicationController around_action :web_timeout - # Helper methods for checking consistency - include ConsistencyValidations - ## # list non-empty changesets in reverse chronological order def index @@ -88,8 +84,9 @@ class ChangesetsController < ApplicationController @way_pages, @ways = paginate(:old_ways, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "way_page") @relation_pages, @relations = paginate(:old_relations, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "relation_page") if @changeset.user.active? && @changeset.user.data_public? - @next_by_user = @changeset.user.changesets.where("id > ?", @changeset.id).reorder(:id => :asc).first - @prev_by_user = @changeset.user.changesets.where("id < ?", @changeset.id).reorder(:id => :desc).first + changesets = conditions_nonempty(@changeset.user.changesets) + @next_by_user = changesets.where("id > ?", @changeset.id).reorder(:id => :asc).first + @prev_by_user = changesets.where("id < ?", @changeset.id).reorder(:id => :desc).first end render :layout => map_layout rescue ActiveRecord::RecordNotFound