From 954261fb1c5c328bba388a70e4ea013ad9667c23 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 22 Nov 2013 12:13:12 -0800 Subject: [PATCH] Restore prev/next changeset by user links --- app/controllers/browse_controller.rb | 4 ++++ app/views/browse/changeset.html.erb | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 29cd6707f..cdcd90610 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -60,6 +60,10 @@ class BrowseController < ApplicationController @node_pages, @nodes = paginate(:old_nodes, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'node_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') + if @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 + end rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found end diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index aa333cfff..736abf12f 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -48,6 +48,23 @@ <% end %> +<% if @next_by_user || @prev_by_user %> +
+ <% if @prev_by_user %> + <%= link_to "<< #{@prev_by_user.id}", :id => @prev_by_user.id %> + · + <% end %> + <%= + user = (@prev_by_user || @next_by_user).user.display_name + link_to user, :controller => "changeset", :action => "list", :display_name => user + %> + <% if @next_by_user %> + · + <%= link_to "#{@next_by_user.id} >>", :id => @next_by_user.id %> + <% end %> +
+<% end %> +
<%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %> · -- 2.43.2