Attempt to fix job log links

diff --git a/lib/Gruntmaster/Page/Generic.pm b/lib/Gruntmaster/Page/Generic.pm
index efb2721848ed879b404a84b2f3380888bba38a30..eefa9080e3f41d52ecca6a89a247895bcc4d304c 100644 (file)
--- a/lib/Gruntmaster/Page/Generic.pm
+++ b/lib/Gruntmaster/Page/Generic.pm
@@ -162,11 +162,13 @@ thing {
        };
        sortby { $b->{id} <=> $a->{id}};
        mangle {
        };
        sortby { $b->{id} <=> $a->{id}};
        mangle {

+               my $env = shift;

                $_->{results} &&= decode_json $_->{results};
                $_->{owner_name} = $_->{rs}->owner->name;
                $_->{problem_name} = $_->{rs}->problem->name;
                $_->{size} = length $_->{source};
                delete $_->{source};
                $_->{results} &&= decode_json $_->{results};
                $_->{owner_name} = $_->{rs}->owner->name;
                $_->{problem_name} = $_->{rs}->problem->name;
                $_->{size} = length $_->{source};
                delete $_->{source};

+               $_->{pageprefix} = $env->{'gruntmaster.page'} == -1 ? 'page/' : '';

        }
 };
 
        }
 };
 

diff --git a/tmpl/log.en b/tmpl/log.en
index f2c79838c608d40a4f87cdee04daa729d4acfac7..d4229d6b9ca4392a6a2b36837e02544037ab9f59 100644 (file)
--- a/tmpl/log.en
+++ b/tmpl/log.en
@@ -12,6 +12,6 @@
 </table>
 
 <ul class="pager">
 </table>
 
 <ul class="pager">

-<%perl if (__CURRENT__->{page} > 1) { %><li class="previous"><a href="<%perl __OUT__ __CURRENT__->{page} - 1; %>">Previous</a><%perl } %>
-<%perl if (__CURRENT__->{page} < __CURRENT__->{pages} - 1) { %><li class="next"><a href="<%perl __OUT__ __CURRENT__->{page} + 1; %>">Next</a><%perl } %>
+<%perl if (__CURRENT__->{page} > 1) { %><li class="previous"><a href="<tmpl_var pageprefix><%perl __OUT__ __CURRENT__->{page} - 1; %>">Previous</a><%perl } %>
+<%perl if (__CURRENT__->{page} < __CURRENT__->{pages} - 1) { %><li class="next"><a href="<tmpl_var pageprefix><%perl __OUT__ __CURRENT__->{page} + 1; %>">Next</a><%perl } %>

 </ul>
 </ul>