X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=7a980737a7fd4eb5fe6da2a7bcf075d0e1845956;hb=ff4a482ff70a3ff572ae8a3dd23de0ba5ebf4989;hp=ea2e99ea3c44d199ccd1460c859a5bd10d9db861;hpb=2d39838c2a02e453a7c9c4d0d2633a250004aec8;p=gruntmaster-page.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index ea2e99e..7a98073 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -9,7 +9,6 @@ use HTML::TreeBuilder;
 use POSIX qw//;
 use Data::Dumper qw/Dumper/;
 use Sort::ByExample
-  sorter => {-as => 'pb_sort', example => [qw/beginner easy medium hard/], xform => sub {$_->{level}}},
   sorter => {-as => 'ct_sort', example => [qw/Running Pending Finished/], xform => sub {$_->{status}}};
 
 my $optional_end_tags = {%HTML::Tagset::optionalEndTag, tr => 1, td => 1, th => 1};
@@ -49,7 +48,7 @@ sub HTML::Element::fclass { shift->look_down(class => qr/\b$_[0]\b/) }
 
 sub HTML::Element::namedlink {
 	my ($self, $id, $name) = @_;
-	$name = $id unless $name =~ /[[:graph:]]/;
+	$name = $id unless $name && $name =~ /[[:graph:]]/;
 	$self = $self->find('a');
 	$self->edit_href(sub {s/id/$id/});
 	$self->replace_content($name);
@@ -216,13 +215,13 @@ sub process_pb {
 		$tr->set_child_content(class => 'author', $data->{author});
 		$tr->set_child_content(class => 'level', ucfirst $data->{level});
 		$tr->fclass('name')->namedlink($data->{id}, $data->{name});
-		$tr->fclass('name')->find('a')->edit_href(sub {$_ .= "?contest=$args{contest}"}) if $args{contest};
+		$tr->fclass('name')->find('a')->edit_href(sub {$_ .= "?contest=$args{args}{contest}"}) if $args{args}{contest};
 		$tr->fclass('owner')->namedlink($data->{owner}, $data->{owner_name});
-		$tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private} && !$args{contest};
+		$tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private} && !$args{args}{contest};
 	};
 
-	$tree->find('tbody')->find('tr')->iter3([pb_sort @{$args{pb}}], $iter);
-	$tree->fid('open-alert')->detach unless $args{contest};
+	$tree->find('tbody')->find('tr')->iter3([sort { $a->{value} <=> $b->{value} } @{$args{pb}}], $iter);
+	$tree->fid('open-alert')->detach unless $args{args}{contest};
 }
 
 sub process_log_entry {
@@ -257,7 +256,7 @@ sub process_log {
 		my ($data, $tr) = @_;
 		$tr->fclass('id')->namedlink($data->{id});
 		$tr->fclass('problem')->namedlink($data->{problem}, $data->{problem_name});
-		$tr->fclass('problem')->find('a')->edit_href(sub{$_ .= "?contest=$args{args}{contest}"}) if $args{args}{contest};
+		$tr->fclass('problem')->find('a')->edit_href(sub{$_ .= '?contest='.$data->{contest}}) if $data->{contest};
 		$tr->fclass('contest')->namedlink($data->{contest}, $data->{contest_name}) if $data->{contest};
 		$tr->fclass('contest')->replace_content('None') unless $data->{contest};
 		$tr->fclass('date')->replace_content(ftime $data->{date});