From 07725b4b4bccd2c1536610be700de2a20106cebf Mon Sep 17 00:00:00 2001 From: Thomas Wood Date: Fri, 19 Jun 2009 23:56:15 +0000 Subject: [PATCH 1/1] Changeset navigation by a particular user's changesets. (Closes #1726) --- app/controllers/browse_controller.rb | 5 ++++- app/views/browse/_navigation.html.erb | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 8124d4a33..91d8eb84f 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -69,7 +69,10 @@ class BrowseController < ApplicationController @title = "#{I18n.t('browse.changeset.title')} | #{@changeset.id}" @next = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id", { :id => @changeset.id }] ) - @prev = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id", { :id => @changeset.id }] ) + @prev = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id", { :id => @changeset.id }] ) + + @next_by_user = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id AND user_id = :user_id", {:id => @changeset.id, :user_id => @changeset.user_id }] ) + @prev_by_user = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id AND user_id = :user_id", {:id => @changeset.id, :user_id => @changeset.user_id }] ) rescue ActiveRecord::RecordNotFound @type = "changeset" render :action => "not_found", :status => :not_found diff --git a/app/views/browse/_navigation.html.erb b/app/views/browse/_navigation.html.erb index 57e724d42..5cfb1be3a 100644 --- a/app/views/browse/_navigation.html.erb +++ b/app/views/browse/_navigation.html.erb @@ -1,4 +1,21 @@
+ <% if @next_by_user or @prev_by_user %> + <% if @prev_by_user %> + < + <%= link_to @prev_by_user.id.to_s, :id => @prev_by_user.id %> + <% end %> + | + <%= + user = (@prev_by_user || @next_by_user).user.display_name + link_to(h(user), :controller => "changeset", :action => "list", :display_name => user) + %> + | + <% if @next_by_user %> + <%= link_to @next_by_user.id.to_s, :id => @next_by_user.id %> + > + <% end %> +
+ <% end %> <% if @prev %> < <%= link_to @prev.id.to_s, :id => @prev.id %> -- 2.43.2