You are here: Home > Latest news from Darcs > Avoids displaying revision tag when not needed

Revision 20080325215345-49d33-92e22e...

Avoids displaying revision tag when not needed

app/views/wiki/show.rhtml
test/functional/wiki_controller_test.rb

Changes to show.rhtml

1
<% pagetext(@page.title, @page.respond_to?(:position) ? '(Revision %s)' / @page.position.to_s : nil) do %>
<% pagetext(@page.title, @page.position ? '(Revision %s)' / @page.position.to_s : nil) do %>
1
2
  <% cache(:controller=> 'wiki', :action => 'show',
  <% cache(:controller=> 'wiki', :action => 'show',
2
3
           :page => @page.name, :locale_suffix => @locale,
           :page => @page.name, :locale_suffix => @locale,
3
4
           :revision => @page_revision_id) do %>
           :revision => @page_revision_id) do %>
4

Changes to wiki_controller_test.rb

512
    assert_tag :pre, :content => page.revisions[1].text
    assert_tag :pre, :content => page.revisions[1].text
512
513
  end
  end
513
514
514
 
  def test_does_not_display_revision_label_when_simply_displaying_a_page
515
 
    get :show, :page_name => pages('changed_page').name
516
 
    assert_no_xml_element '//div[@class="page-title"]/span[@id="revision"]'
517
 
  end
518
 
519
515
private
private
520
516
521
517
  def log_as(user_name)
  def log_as(user_name)
522