From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 28 Feb 2014 10:34:09 +0000 (+0200)
Subject: Also do this for standings and problem entry. And do it correctly in log
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=1ad43ccc6aec756b3f2cc47b9da57ba67de29165;p=gruntmaster-page.git

Also do this for standings and problem entry. And do it correctly in log
---

diff --git a/lib/Gruntmaster/Page/Log.pm b/lib/Gruntmaster/Page/Log.pm
index f63f832..6848bcf 100644
--- a/lib/Gruntmaster/Page/Log.pm
+++ b/lib/Gruntmaster/Page/Log.pm
@@ -19,12 +19,12 @@ sub _generate{
 		date => (job_date() ? strftime ('%c' => localtime job_date) : '?'),
 		extension => job_extension,
 		name => problem_name job_problem,
-		user_name => do { local $Gruntmaster::Data::contest; user_name job_user },
 		problem => job_problem,
 		result => job_result,
 		result_text => job_result_text,
 		size => sprintf ("%.2f KiB", job_filesize() / 1024),
 		user => job_user}, ($page - 1) * PAGE_SIZE + 1 .. ($page == $pages ? jobcard : $page * PAGE_SIZE);
+	$_->{user_name} = do { local $Gruntmaster::Data::contest; user_name $_->{user} } for @log;
 	$htc->param(log => \@log);
 	$htc->param(next => $page + 1) unless $page == $pages;
 	$htc->param(prev => $page - 1) unless $page == 1;
diff --git a/lib/Gruntmaster/Page/Pb/Entry.pm b/lib/Gruntmaster/Page/Pb/Entry.pm
index f03fe7a..12f5e74 100644
--- a/lib/Gruntmaster/Page/Pb/Entry.pm
+++ b/lib/Gruntmaster/Page/Pb/Entry.pm
@@ -25,6 +25,7 @@ sub _generate{
 	$htc->param(name => problem_name $id);
 	$htc->param(author => problem_author $id);
 	$htc->param(owner => problem_owner $id);
+	$htc->param(owner_name => do{ local $Gruntmaster::Data::contest; user_name $htc->param('owner')} );
 	$htc->param(statement => problem_statement $id);
 }
 
diff --git a/tmpl/pb_entry.en b/tmpl/pb_entry.en
index 15e4539..cccb33a 100644
--- a/tmpl/pb_entry.en
+++ b/tmpl/pb_entry.en
@@ -6,7 +6,7 @@
 <div class="col-md-3">
 <dl>
 <dt>Author</dt> <dd><tmpl_var author></dd>
-<dt>Owner</dt> <dd><tmpl_var owner></dd>
+<dt>Owner</dt> <dd><a href="/us/<tmpl_var owner>"><tmpl_if owner_name><tmpl_var owner_name><tmpl_else><tmpl_var owner></tmpl_if></a></dd>
 </dl>
 
 <tmpl_if cansubmit>