deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added explicit sorting of authors and pages in Authors page

Browse source
This commit is contained in:
Alexey Verkhovsky 2005-05-29 14:18:05 +00:00
parent c00d1ca0f1
commit a1527f60b0
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/wiki_controller.rb
View file

@ -42,7 +42,7 @@ class WikiController < ApplicationController
# Within a single web --------------------------------------------------------- # Within a single web ---------------------------------------------------------
def authors def authors
@authors = @web.select.authors @authors = @web.select.authors.sort
end end
def export_html def export_html

2
app/views/wiki/authors.rhtml
View file

@ -5,7 +5,7 @@
<li> <li>
<%= link_to_page author %> <%= link_to_page author %>
co- or authored: co- or authored:
<%= @web.select.pages_authored_by(author).collect { |page| link_to_page(page.name) }.join ', ' %> <%= @web.select.pages_authored_by(author).collect { |page| link_to_page(page.name) }.sort.join ', ' %>
</li> </li>
<% end %> <% end %>
</ul> </ul>

7
test/watir/e2e.rb
View file

@ -192,13 +192,16 @@ class E2EInstikiTest < Test::Unit::TestCase
ie.link(:text, 'Authors').click ie.link(:text, 'Authors').click
expected_authors = expected_authors =
'Anonymous Coward\? co- or authored: Test Edit Page, Another Wiki Page, Home Page.*' + 'Anonymous Coward\? co- or authored: Another Wiki Page, Home Page, Test Edit Page.*' +
'Another Author co- or authored: Test Edit Page, Another Author.*' + 'Another Author co- or authored: Another Author, Test Edit Page.*' +
'Author\? co- or authored: Test Edit Page' 'Author\? co- or authored: Test Edit Page'
assert_match Regexp.new(expected_authors, Regexp::MULTILINE), ie.text assert_match Regexp.new(expected_authors, Regexp::MULTILINE), ie.text
ie.link(:text, 'Another Author').click ie.link(:text, 'Another Author').click
assert_equal url(:show, 'Another Author'), ie.url assert_equal url(:show, 'Another Author'), ie.url
ie.back
ie.link(:text, 'Test Edit Page').click
assert_equal url(:show, 'TestEditPage'), ie.url
end end
private private