marcel/linkding
1
0
Fork 0
mirror of https://github.com/sissbruecker/linkding.git synced 2025-10-07 16:29:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix pagination links to use relative URLs (#1186)

Browse Source
This commit is contained in:
Dunlor
2025-10-03 09:54:50 +02:00
committed by GitHub
parent 128e1afbce
commit 0c18b83a8e
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bookmarks/templatetags/pagination.py
View File

@@ -14,7 +14,7 @@ register = template.Library()
)
def pagination(context, page: Page):
request = context["request"]
base_url = request.build_absolute_uri(request.path)
base_url = request.path
# remove page number and details from query parameters
query_params = request.GET.copy()

22
bookmarks/tests/test_pagination_tag.py
View File

@@ -32,7 +32,7 @@ class PaginationTagTest(TestCase, BookmarkFactoryMixin):
)
def assertPrevLink(self, html: str, page_number: int, href: str = None):
href = href if href else "http://testserver/test?page={0}".format(page_number)
href = href if href else "/test?page={0}".format(page_number)
self.assertInHTML(
"""
<li class="page-item">
@@ -55,7 +55,7 @@ class PaginationTagTest(TestCase, BookmarkFactoryMixin):
)
def assertNextLink(self, html: str, page_number: int, href: str = None):
href = href if href else "http://testserver/test?page={0}".format(page_number)
href = href if href else "/test?page={0}".format(page_number)
self.assertInHTML(
"""
<li class="page-item">
@@ -76,7 +76,7 @@ class PaginationTagTest(TestCase, BookmarkFactoryMixin):
href: str = None,
):
active_class = "active" if active else ""
href = href if href else "http://testserver/test?page={0}".format(page_number)
href = href if href else "/test?page={0}".format(page_number)
self.assertInHTML(
"""
<li class="page-item {1}">
@@ -167,35 +167,35 @@ class PaginationTagTest(TestCase, BookmarkFactoryMixin):
self.assertPrevLink(
rendered_template,
1,
href="http://testserver/test?q=cake&sort=title_asc&page=1",
href="/test?q=cake&sort=title_asc&page=1",
)
self.assertPageLink(
rendered_template,
1,
False,
href="http://testserver/test?q=cake&sort=title_asc&page=1",
href="/test?q=cake&sort=title_asc&page=1",
)
self.assertPageLink(
rendered_template,
2,
True,
href="http://testserver/test?q=cake&sort=title_asc&page=2",
href="/test?q=cake&sort=title_asc&page=2",
)
self.assertNextLink(
rendered_template,
3,
href="http://testserver/test?q=cake&sort=title_asc&page=3",
href="/test?q=cake&sort=title_asc&page=3",
)
def test_removes_details_parameter(self):
rendered_template = self.render_template(
100, 10, 2, url="/test?details=1&page=2"
)
self.assertPrevLink(rendered_template, 1, href="http://testserver/test?page=1")
self.assertPrevLink(rendered_template, 1, href="/test?page=1")
self.assertPageLink(
rendered_template, 1, False, href="http://testserver/test?page=1"
rendered_template, 1, False, href="/test?page=1"
)
self.assertPageLink(
rendered_template, 2, True, href="http://testserver/test?page=2"
rendered_template, 2, True, href="/test?page=2"
)
self.assertNextLink(rendered_template, 3, href="http://testserver/test?page=3")
self.assertNextLink(rendered_template, 3, href="/test?page=3")