summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Czygan <martin@archive.org>2020-01-18 13:22:15 +0000
committerMartin Czygan <martin@archive.org>2020-01-18 13:22:15 +0000
commit68d5519e09d1449d03f55c5a3e3251781b0dc192 (patch)
tree044b2c8d9e4bfc636fcb0f886cdad668171e6faa
parentd443a5d1c6813e4451137511951129446e017be3 (diff)
parente251400af21d9457fcf9c5cd0d15c20424fbb40b (diff)
downloadfatcat-68d5519e09d1449d03f55c5a3e3251781b0dc192.tar.gz
fatcat-68d5519e09d1449d03f55c5a3e3251781b0dc192.zip
Merge branch 'martin-fix-container-search' into 'master'
pagination: use correct endpoint in navigation See merge request webgroup/fatcat!19
-rw-r--r--python/fatcat_web/templates/container_search.html2
-rw-r--r--python/fatcat_web/templates/entity_macros.html10
2 files changed, 6 insertions, 6 deletions
diff --git a/python/fatcat_web/templates/container_search.html b/python/fatcat_web/templates/container_search.html
index 48c613f8..1a089643 100644
--- a/python/fatcat_web/templates/container_search.html
+++ b/python/fatcat_web/templates/container_search.html
@@ -53,7 +53,7 @@
{% if found.results|length > 8 %}
<div class="ui divider"></div>
<div style="text-align: center">
- {{ entity_macros.bottom_results(found)}}
+ {{ entity_macros.bottom_results(found, endpoint='container_search')}}
</div>
{% endif %}
{% else %}
diff --git a/python/fatcat_web/templates/entity_macros.html b/python/fatcat_web/templates/entity_macros.html
index df26a738..7c5436c6 100644
--- a/python/fatcat_web/templates/entity_macros.html
+++ b/python/fatcat_web/templates/entity_macros.html
@@ -242,7 +242,7 @@ yellow
{% else %}
results {{ found.offset }} &mdash;
{% endif %}
-
+
{{ found.offset + found.count_returned }}
out of {{ found.count_found }} results
</i>
@@ -250,13 +250,13 @@ yellow
{%- endmacro %}
-{% macro bottom_results(found) -%}
+{% macro bottom_results(found, endpoint='release_search') -%}
{% if found.offset > 0 %}
{% if found.offset - found.limit < 0 %}
- <a href="{{ url_for('release_search', q=found.query.q, offset=0) }}">&#xab; Previous</a>
+ <a href="{{ url_for(endpoint, q=found.query.q, offset=0) }}">&#xab; Previous</a>
{% else %}
- <a href="{{ url_for('release_search', q=found.query.q, offset=found.offset - found.limit) }}">&#xab; Previous</a>
+ <a href="{{ url_for(endpoint, q=found.query.q, offset=found.offset - found.limit) }}">&#xab; Previous</a>
{% endif %}
{% else %}
<span style="color:gray">&#xab; Previous</span>
@@ -266,7 +266,7 @@ yellow
found.count_returned }} out of {{ found.count_found }} results</i>&nbsp;&nbsp;
{% if found.offset + found.limit < found.count_found and found.offset + found.limit < found.deep_page_limit %}
- <a href="{{ url_for('release_search', q=found.query.q, offset=found.offset + found.limit) }}">Next &#xbb;</a>
+ <a href="{{ url_for(endpoint, q=found.query.q, offset=found.offset + found.limit) }}">Next &#xbb;</a>
{% else %}
<span style="color:gray">Next &#xbb;</span>
{% endif %}