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

Merge remote-tracking branch 'upstream/pull/4747'

Browse source
This commit is contained in:
Tom Hughes 2024-05-02 17:52:45 +01:00
commit b3759c0d58
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/changesets_controller.rb
View file

@ -84,8 +84,9 @@ class ChangesetsController < ApplicationController
@way_pages, @ways = paginate(:old_ways, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "way_page") @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") @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? if @changeset.user.active? && @changeset.user.data_public?
@next_by_user = @changeset.user.changesets.where("id > ?", @changeset.id).reorder(:id => :asc).first changesets = conditions_nonempty(@changeset.user.changesets)
@prev_by_user = @changeset.user.changesets.where("id < ?", @changeset.id).reorder(:id => :desc).first @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 end
render :layout => map_layout render :layout => map_layout
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound

15
test/controllers/changesets_controller_test.rb
View file

@ -321,13 +321,26 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
def test_show_adjacent_changesets def test_show_adjacent_changesets
user = create(:user) user = create(:user)
changesets = create_list(:changeset, 3, :user => user) changesets = create_list(:changeset, 3, :user => user, :num_changes => 1)
sidebar_browse_check :changeset_path, changesets[1].id, "changesets/show" sidebar_browse_check :changeset_path, changesets[1].id, "changesets/show"
assert_dom "a[href='#{changeset_path changesets[0]}']", :count => 1 assert_dom "a[href='#{changeset_path changesets[0]}']", :count => 1
assert_dom "a[href='#{changeset_path changesets[2]}']", :count => 1 assert_dom "a[href='#{changeset_path changesets[2]}']", :count => 1
end end
def test_show_adjacent_nonempty_changesets
user = create(:user)
changeset1 = create(:changeset, :user => user, :num_changes => 1)
create(:changeset, :user => user, :num_changes => 0)
changeset3 = create(:changeset, :user => user, :num_changes => 1)
create(:changeset, :user => user, :num_changes => 0)
changeset5 = create(:changeset, :user => user, :num_changes => 1)
sidebar_browse_check :changeset_path, changeset3.id, "changesets/show"
assert_dom "a[href='#{changeset_path changeset1}']", :count => 1
assert_dom "a[href='#{changeset_path changeset5}']", :count => 1
end
## ##
# This should display the last 20 non-empty changesets # This should display the last 20 non-empty changesets
def test_feed def test_feed