Add links and full names to usernames in tables

diff --git a/lib/Gruntmaster/Page/Generic.pm b/lib/Gruntmaster/Page/Generic.pm
index 95d1cd8cac6f791d0a73a49ea9f507a6850bcd9c..3fdd47c0a157d7e190ab5c5c6464bf1e5b53787e 100644 (file)
--- a/lib/Gruntmaster/Page/Generic.pm
+++ b/lib/Gruntmaster/Page/Generic.pm
@@ -109,19 +109,20 @@ thing {
        contest;
        sortby { $a->{name} cmp $b->{name} };
        group { $_->{level} };
+       mangle { $_->{owner_name} = do { local $Gruntmaster::Data::contest; user_name $_->{owner} } }
 };
 
 thing {
        params qw/ct contest Contests/;
        sortby { $a->{start} <=> $b->{start} };
        group { time < $_->{start} ? 'pending' : time > $_->{end} ? 'finished' : 'running' };
-       mangle { $_->{started} = time >= $_->{start} };
+       mangle { $_->{started} = time >= $_->{start}; $_->{owner_name} = do { local $Gruntmaster::Data::contest; user_name $_->{owner} } };
 };
 
 thing {
        params qw/log job/, 'Job log';
        contest;
-       mangle { $_->{results} &&= decode_json $_->{results}; }
+       mangle { $_->{results} &&= decode_json $_->{results}; $_->{user_name} = do { local $Gruntmaster::Data::contest; user_name $_->{user} } }
 };
 
 1

diff --git a/lib/Gruntmaster/Page/Log.pm b/lib/Gruntmaster/Page/Log.pm
index 7fe888523f0809acda18af0cf88eb0545ff33dae..f63f832cf0279d0c01916c513e7d2b810691475e 100644 (file)
--- a/lib/Gruntmaster/Page/Log.pm
+++ b/lib/Gruntmaster/Page/Log.pm
@@ -19,6 +19,7 @@ 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,

diff --git a/tmpl/ct.en b/tmpl/ct.en
index 045bf741e6653794ec120c048d67a969b5595834..d39bbcb57eb2e4fdde17718cf80abe44486193cc 100644 (file)
--- a/tmpl/ct.en
+++ b/tmpl/ct.en
@@ -7,7 +7,7 @@
 <tmpl_loop running><tr><td><a href="<tmpl_var id>/"><tmpl_var name></a>
 <td><%perl __OUT__ POSIX::strftime '%c', localtime __CURRENT__->{start}; %>
 <td><%perl __OUT__ POSIX::strftime '%c', localtime __CURRENT__->{end};   %>
-<td><tmpl_var owner>
+<td><a href="/us/<tmpl_var owner>"><tmpl_var owner></a><tmpl_if owner_name> (<tmpl_var owner_name>)</tmpl_if>
 </tmpl_loop>
 </table>
 </tmpl_if>
@@ -21,7 +21,7 @@
 <tmpl_loop pending><tr><td><a href="<tmpl_var id>/"><tmpl_var name></a>
 <td><%perl __OUT__ POSIX::strftime '%c', localtime __CURRENT__->{start}; %>
 <td><%perl __OUT__ POSIX::strftime '%c', localtime __CURRENT__->{end};   %>
-<td><tmpl_var owner>
+<td><a href="/us/<tmpl_var owner>"><tmpl_var owner></a><tmpl_if owner_name> (<tmpl_var owner_name>)</tmpl_if>
 </tmpl_loop>
 </table>
 </tmpl_if>
@@ -35,7 +35,7 @@
 <tmpl_loop finished><tr><td><a href="<tmpl_var id>/"><tmpl_var name></a>
 <td><%perl __OUT__ POSIX::strftime '%c', localtime __CURRENT__->{start}; %>
 <td><%perl __OUT__ POSIX::strftime '%c', localtime __CURRENT__->{end};   %>
-<td><tmpl_var owner>
+<td><a href="/us/<tmpl_var owner>"><tmpl_var owner></a><tmpl_if owner_name> (<tmpl_var owner_name>)</tmpl_if>
 </tmpl_loop>
 </table>
 </tmpl_if>

diff --git a/tmpl/log.en b/tmpl/log.en
index 2ef59afcf7a9077d648b16cbecb6c0f05a9d6c2c..de918a257371943fb359dcc88166b6cb0e684af3 100644 (file)
--- a/tmpl/log.en
+++ b/tmpl/log.en
@@ -6,7 +6,7 @@
 <td><a href="../pb/<tmpl_var problem>"><tmpl_var name></a>
 <td><tmpl_var date>
 <td><a href="src/<tmpl_var id>.<tmpl_var extension>"<tmpl_if private> data-private</tmpl_if>><tmpl_var size></a>
-<td><tmpl_var user><td class="r<tmpl_var result>"><tmpl_var result_text>
+<td><a href="/us/<tmpl_var user>"><tmpl_var user></a><tmpl_if user_name> (<tmpl_var user_name>)</tmpl_if><td class="r<tmpl_var result>"><tmpl_var result_text>
 </tmpl_loop>
 </table>
 

diff --git a/tmpl/pb.en b/tmpl/pb.en
index 00569dfc0a662c76ce353c1ed038b198dc25f2ce..341ffbe7d9ae443282368f75630c61a81a1eac9c 100644 (file)
--- a/tmpl/pb.en
+++ b/tmpl/pb.en
@@ -3,7 +3,7 @@
 <table border class="table table-bordered table-striped table-fixed">
 <thead><tr><th>Name<th>Author<th>Owner
 <tbody>
-<tmpl_loop beginner><tr><td><a href="<tmpl_var id>"><tmpl_var name></a><td><tmpl_var author><td><tmpl_var owner>
+<tmpl_loop beginner><tr><td><a href="<tmpl_var id>"><tmpl_var name></a><td><tmpl_var author><td><a href="/us/<tmpl_var owner>"><tmpl_var owner></a><tmpl_if owner_name> (<tmpl_var owner_name>)</tmpl_if>
 </tmpl_loop>
 </table>
 </tmpl_if>
@@ -13,7 +13,7 @@
 <table border class="table table-bordered table-striped table-fixed">
 <thead><tr><th>Name<th>Author<th>Owner
 <tbody>
-<tmpl_loop easy><tr><td><a href="<tmpl_var id>"><tmpl_var name></a><td><tmpl_var author><td><tmpl_var owner>
+<tmpl_loop easy><tr><td><a href="<tmpl_var id>"><tmpl_var name></a><td><tmpl_var author><td><a href="/us/<tmpl_var owner>"><tmpl_var owner></a><tmpl_if owner_name> (<tmpl_var owner_name>)</tmpl_if>
 </tmpl_loop>
 </table>
 </tmpl_if>
@@ -23,7 +23,7 @@
 <table border class="table table-bordered table-striped table-fixed">
 <thead><tr><th>Name<th>Author<th>Owner
 <tbody>
-<tmpl_loop medium><tr><td><a href="<tmpl_var id>"><tmpl_var name></a><td><tmpl_var author><td><tmpl_var owner>
+<tmpl_loop medium><tr><td><a href="<tmpl_var id>"><tmpl_var name></a><td><tmpl_var author><td><a href="/us/<tmpl_var owner>"><tmpl_var owner></a><tmpl_if owner_name> (<tmpl_var owner_name>)</tmpl_if>
 </tmpl_loop>
 </table>
 </tmpl_if>
@@ -33,7 +33,7 @@
 <table border class="table table-bordered table-striped table-fixed">
 <thead><tr><th>Name<th>Author<th>Owner
 <tbody>
-<tmpl_loop hard><tr><td><a href="<tmpl_var id>"><tmpl_var name></a><td><tmpl_var author><td><tmpl_var owner>
+<tmpl_loop hard><tr><td><a href="<tmpl_var id>"><tmpl_var name></a><td><tmpl_var author><td><a href="/us/<tmpl_var owner>"><tmpl_var owner></a><tmpl_if owner_name> (<tmpl_var owner_name>)</tmpl_if>
 </tmpl_loop>
 </table>
 </tmpl_if>