Skip to content

Commit

Permalink
/users/ without a letter in the query string now shows the latests users
Browse files Browse the repository at this point in the history
Signed-off-by: Zachary Scott <[email protected]>
  • Loading branch information
AndrewVos authored and Zachary Scott committed Mar 26, 2011
1 parent fb349d6 commit 81be68b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
7 changes: 6 additions & 1 deletion rstatus.rb
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,12 @@ class Rstatus < Sinatra::Base
@users = User
end

@users = @users.sort(:username).paginate(:page => params[:page], :per_page => params[:per_page])
if params[:letter]
@users = @users.sort(:username)
else
@users = @users.sort(:created_at.desc)
end
@users = @users.paginate(:page => params[:page], :per_page => params[:per_page])

@next_page = nil
@prev_page = nil
Expand Down
8 changes: 4 additions & 4 deletions test/rstatus_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -272,15 +272,15 @@ def test_users_browse_paginates
assert_match "Next", page.body
end

def test_users_browse_sorted
zebra = Factory(:user, :username => "zebra")
aardvark = Factory(:user, :username => "aardvark")
def test_users_browse_shows_latest_users
aardvark = Factory(:user, :username => "aardvark", :created_at => Date.new(2010, 10, 23))
zebra = Factory(:user, :username => "zebra", :created_at => Date.new(2011, 10, 23))
a = Factory(:authorization, :user => aardvark)

log_in(aardvark, a.uid)

visit "/users"
assert_match /aardvark.*zebra/m, page.body
assert_match /zebra.*aardvark/m, page.body
end

def test_users_browse_by_letter
Expand Down

0 comments on commit 81be68b

Please sign in to comment.