From 62b6d159672ad29344c7b7074a37d23b16dbb5d9 Mon Sep 17 00:00:00 2001 From: Thomas Wood Date: Tue, 23 Dec 2008 15:47:06 +0000 Subject: [PATCH] Make browse controller index show recently closed changesets, rather than recently changed nodes. --- app/controllers/browse_controller.rb | 2 +- app/views/browse/index.rhtml | 18 +++++++++------ test/functional/browse_controller_test.rb | 27 ++++++++++++++--------- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 60f580963..2e4af03d8 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -8,7 +8,7 @@ class BrowseController < ApplicationController end def index - @nodes = Node.find(:all, :order => "timestamp DESC", :limit=> 20) + @changesets = Changeset.find(:all, :order => "closed_at DESC", :limit=> 20) end def relation diff --git a/app/views/browse/index.rhtml b/app/views/browse/index.rhtml index e9d830a10..fa7e13ac0 100644 --- a/app/views/browse/index.rhtml +++ b/app/views/browse/index.rhtml @@ -1,12 +1,16 @@ -

<%= @nodes.length %> Recently Changed Nodes

+

<%= @changesets.length %> Recently Closed Changesets

diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb index 65e851011..a36fa3703 100644 --- a/test/functional/browse_controller_test.rb +++ b/test/functional/browse_controller_test.rb @@ -18,20 +18,27 @@ class BrowseControllerTest < ActionController::TestCase end - # This should display the last 20 nodes that were edited. + # This should display the last 20 changesets closed. def test_index - @nodes = Node.find(:all, :order => "timestamp DESC", :limit => 20) - assert @nodes.size <= 20 + @changesets = Changeset.find(:all, :order => "closed_at DESC", :limit=> 20) + assert @changesets.size <= 20 get :index assert_response :success assert_template "index" - # Now check that all 20 (or however many were returned) nodes are in the html - assert_select "h2", :text => "#{@nodes.size} Recently Changed Nodes", :count => 1 - assert_select "ul[id='recently_changed'] li a", :count => @nodes.size - @nodes.each do |node| - name = node.tags_as_hash['name'].to_s - name = "(No name)" if name.length == 0 - assert_select "ul[id='recently_changed'] li a[href=/browse/node/#{node.id}]", :text => "#{name} - #{node.id} (#{node.version})" + # Now check that all 20 (or however many were returned) changesets are in the html + assert_select "h2", :text => "#{@changesets.size} Recently Closed Changesets", :count => 1 + assert_select "ul[id='recently_changed'] li a", :count => @changesets.size + @changesets.each do |changeset| + if changeset.user.data_public? + user = changeset.user.display_name + else + user = "(anonymous)" + end + + cmt = changeset.tags_as_hash['comment'].to_s + cmt = "(no comment)" if cmt.length == 0 + text = "#{changeset.id} by #{user} - #{cmt}" + assert_select "ul[id='recently_changed'] li a[href=/browse/changeset/#{changeset.id}]", :text => text end end -- 2.43.2