Fix (hopefully) the page links in log.en

diff --git a/lib/Gruntmaster/Page/Generic.pm b/lib/Gruntmaster/Page/Generic.pm
index 317fc6a6a2e35d3599d30e8ed5a2fbc844b299b8..209691994107b08e071a1c56d9bcb0bcd1d379b1 100644 (file)
--- a/lib/Gruntmaster/Page/Generic.pm
+++ b/lib/Gruntmaster/Page/Generic.pm
@@ -38,6 +38,7 @@ sub list {
        $rs = $rs->search(undef, {order_by => 'me.id'}) unless $rs->is_ordered;
        if (my $page = $env->{'gruntmaster.page'}) {
                my $pages = int ($rs->count / PAGE_SIZE);
+               $params{default_page} = $page == -1;
                $pages = 1 if $pages < 1;
                $page = $pages if $page == -1;
                @params{'page', 'pages'} = ($page, $pages);
@@ -169,7 +170,6 @@ thing {
                $_->{problem_name} = $_->{rs}->problem->name;
                $_->{size} = length $_->{source};
                delete $_->{source};
-               $_->{pageprefix} = $env->{'gruntmaster.page'} && $env->{'gruntmaster.page'} == -1 ? 'page/' : '';
        }
 };
 

diff --git a/tmpl/log.en b/tmpl/log.en
index d4229d6b9ca4392a6a2b36837e02544037ab9f59..c04c963b5ba2de6f13b41afd27401bb2dc9da5a3 100644 (file)
--- a/tmpl/log.en
+++ b/tmpl/log.en
@@ -12,6 +12,6 @@
 </table>
 
 <ul class="pager">
-<%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 } %>
+<%perl if (__CURRENT__->{page} > 1) { %><li class="previous"><a href="<tmpl_if default_page>page/</tmpl_if><%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 } %>
 </ul>