repos/website
1
Fork 0
Code Issues 1 Pull requests 27 Activity

Use relative URL for singletons

Browse source 
It's rare they'll be needed externally, and this way there's less to do
This commit is contained in:
Jake Howard 2022-08-31 09:12:16 +01:00
parent ce3690384e
commit 27dc383d17
Signed by: jake
GPG key ID: 57AFB45680EDD477
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
website/contrib/singleton_page/tests.py
View file

@ -9,7 +9,7 @@ from .utils import SingletonPageCache
class SingletonURLTestCase(TestCase): class SingletonURLTestCase(TestCase):
def test_gets_url(self) -> None: def test_gets_url(self) -> None:
with self.assertNumQueries(2): with self.assertNumQueries(2):
self.assertEqual(SingletonPageCache.get_url(HomePage), "http://localhost/") self.assertEqual(SingletonPageCache.get_url(HomePage), "/")
def test_missing_page(self) -> None: def test_missing_page(self) -> None:
with self.assertNumQueries(1): with self.assertNumQueries(1):

2
website/contrib/singleton_page/utils.py
View file

@ -25,7 +25,7 @@ class SingletonPageCache:
if page is None: if page is None:
return None return None
url = page.get_full_url(request) url = page.get_url(request)
cache.set(cache_key, url, 86400) cache.set(cache_key, url, 86400)

7
website/well_known/views.py
View file

@ -24,7 +24,12 @@ class SecurityView(TemplateView):
def get_context_data(self, **kwargs: dict) -> dict: def get_context_data(self, **kwargs: dict) -> dict:
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
context["security_txt"] = self.request.build_absolute_uri(self.request.path) context["security_txt"] = self.request.build_absolute_uri(self.request.path)
context["contact_page_url"] = SingletonPageCache.get_url(ContactPage) contact_page_path = SingletonPageCache.get_url(ContactPage)
context["contact_page_url"] = (
self.request.build_absolute_uri(contact_page_path)
if contact_page_path
else None
)
context["expires"] = ( context["expires"] = (
(timezone.now() + self.expires).replace(microsecond=0).isoformat() (timezone.now() + self.expires).replace(microsecond=0).isoformat()
) )