templates: fix broken "less" & "more" links in paper style (issue4460) stable
authorAnton Shestakov <engored@ya.ru>
Fri, 21 Nov 2014 13:58:49 +0800
branchstable
changeset 23377 c00b156d6e76
parent 23376 2e65da5f80df
child 23381 cc0ff93d0c0c
templates: fix broken "less" & "more" links in paper style (issue4460) "/search", which is an invalid command in hgweb, was mistakenly used for "[show] more [revsets]" and "[show] less [revsets]" links on search page in templates "paper" (and those which inherit paper, such as coal) before and worked fine until 6e1fbcb18a75, which made hgweb more strict about invalid commands.
mercurial/templates/paper/search.tmpl
tests/test-hgweb-commands.t
--- a/mercurial/templates/paper/search.tmpl	Wed Nov 19 01:36:17 2014 +0000
+++ b/mercurial/templates/paper/search.tmpl	Fri Nov 21 13:58:49 2014 +0800
@@ -38,8 +38,8 @@
 </form>
 
 <div class="navigate">
-<a href="{url|urlescape}search/{lessvars%urlparameter}">less</a>
-<a href="{url|urlescape}search/{morevars%urlparameter}">more</a>
+<a href="{url|urlescape}log{lessvars%urlparameter}">less</a>
+<a href="{url|urlescape}log{morevars%urlparameter}">more</a>
 </div>
 
 <table class="bigtable">
@@ -54,8 +54,8 @@
 </table>
 
 <div class="navigate">
-<a href="{url|urlescape}search/{lessvars%urlparameter}">less</a>
-<a href="{url|urlescape}search/{morevars%urlparameter}">more</a>
+<a href="{url|urlescape}log{lessvars%urlparameter}">less</a>
+<a href="{url|urlescape}log{morevars%urlparameter}">more</a>
 </div>
 
 </div>
--- a/tests/test-hgweb-commands.t	Wed Nov 19 01:36:17 2014 +0000
+++ b/tests/test-hgweb-commands.t	Fri Nov 21 13:58:49 2014 +0800
@@ -1007,8 +1007,8 @@
   </form>
   
   <div class="navigate">
-  <a href="/search/?rev=base&revcount=5">less</a>
-  <a href="/search/?rev=base&revcount=20">more</a>
+  <a href="/log?rev=base&revcount=5">less</a>
+  <a href="/log?rev=base&revcount=20">more</a>
   </div>
   
   <table class="bigtable">
@@ -1028,8 +1028,8 @@
   </table>
   
   <div class="navigate">
-  <a href="/search/?rev=base&revcount=5">less</a>
-  <a href="/search/?rev=base&revcount=20">more</a>
+  <a href="/log?rev=base&revcount=5">less</a>
+  <a href="/log?rev=base&revcount=20">more</a>
   </div>
   
   </div>