Sort problem and contest lists in user_entry

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 4935e024d2920a8718de26d0d0092a1bee922e16..9d01418c062f08f94f9a39ef41bcf10fd872142c 100644 (file)
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -64,8 +64,8 @@ sub user_list {
 sub user_entry {
        my ($self, $id) = @_;
        my $user = $self->users->find($id, {columns => USER_PUBLIC_COLUMNS, prefetch => [qw/problem_statuses contest_statuses/]});
-       my @problems = map { {problem => $_->get_column('problem'), solved => $_->solved} } $user->problem_statuses;
-       my @contests = map { {contest => $_->contest->id, contest_name => $_->contest->name, rank => $_->rank, score => $_->score} } $user->contest_statuses->search(undef, {prefetch => 'contest'});
+       my @problems = map { {problem => $_->get_column('problem'), solved => $_->solved} } $user->problem_statuses->search(undef, {order_by => 'problem'});
+       my @contests = map { {contest => $_->contest->id, contest_name => $_->contest->name, rank => $_->rank, score => $_->score} } $user->contest_statuses->search(undef, {prefetch => 'contest', order_by => 'contest.start DESC'});
        +{ $user->get_columns, problems => \@problems, contests => \@contests }
 }