aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pydis_site/apps/content/tests/test_views.py2
-rw-r--r--pydis_site/apps/content/views/page_category.py4
-rw-r--r--pydis_site/apps/events/tests/test_views.py4
-rw-r--r--pydis_site/apps/events/views/page.py7
-rw-r--r--pydis_site/settings.py9
5 files changed, 14 insertions, 12 deletions
diff --git a/pydis_site/apps/content/tests/test_views.py b/pydis_site/apps/content/tests/test_views.py
index cd0d0bf7..36d771a1 100644
--- a/pydis_site/apps/content/tests/test_views.py
+++ b/pydis_site/apps/content/tests/test_views.py
@@ -33,7 +33,7 @@ def patch_dispatch_attributes(view: PageOrCategoryView, location: str) -> None:
view.page_path = view.full_location.with_suffix(".md")
-@override_settings(PAGES_PATH=BASE_PATH)
+@override_settings(CONTENT_PAGES_PATH=BASE_PATH)
class PageOrCategoryViewTests(MockPagesTestCase, SimpleTestCase, TestCase):
"""Tests for the PageOrCategoryView class."""
diff --git a/pydis_site/apps/content/views/page_category.py b/pydis_site/apps/content/views/page_category.py
index bb2c07cc..b31814f7 100644
--- a/pydis_site/apps/content/views/page_category.py
+++ b/pydis_site/apps/content/views/page_category.py
@@ -16,7 +16,7 @@ class PageOrCategoryView(TemplateView):
self.location = Path(kwargs.get("location", ""))
# URL location on the filesystem
- self.full_location = settings.PAGES_PATH / self.location
+ self.full_location = settings.CONTENT_PAGES_PATH / self.location
# Possible places to find page content information
self.category_path = self.full_location
@@ -56,7 +56,7 @@ class PageOrCategoryView(TemplateView):
context["breadcrumb_items"] = [
{
- "name": utils.get_category(settings.PAGES_PATH / location)["title"],
+ "name": utils.get_category(settings.CONTENT_PAGES_PATH / location)["title"],
"path": str(location)
} for location in reversed(self.location.parents)
]
diff --git a/pydis_site/apps/events/tests/test_views.py b/pydis_site/apps/events/tests/test_views.py
index 0db0ef9a..23c9e596 100644
--- a/pydis_site/apps/events/tests/test_views.py
+++ b/pydis_site/apps/events/tests/test_views.py
@@ -17,7 +17,7 @@ class IndexTests(TestCase):
class PageTests(TestCase):
- @override_settings(PAGES_PATH=PAGES_PATH)
+ @override_settings(EVENTS_PAGES_PATH=PAGES_PATH)
def test_valid_event_page_reponse_200(self):
"""Should return response code 200 when visiting valid event page."""
pages = (
@@ -29,7 +29,7 @@ class PageTests(TestCase):
resp = self.client.get(page)
self.assertEqual(resp.status_code, 200)
- @override_settings(PAGES_PATH=PAGES_PATH)
+ @override_settings(EVENTS_PAGES_PATH=PAGES_PATH)
def test_invalid_event_page_404(self):
"""Should return response code 404 when visiting invalid event page."""
pages = (
diff --git a/pydis_site/apps/events/views/page.py b/pydis_site/apps/events/views/page.py
index f4c37aeb..eab2f462 100644
--- a/pydis_site/apps/events/views/page.py
+++ b/pydis_site/apps/events/views/page.py
@@ -11,15 +11,16 @@ class PageView(TemplateView):
def get_template_names(self) -> List[str]:
"""Get specific template names."""
path: str = self.kwargs['path']
- page_path = settings.PAGES_PATH / path
+ page_path = settings.EVENTS_PAGES_PATH / path
if page_path.is_dir():
page_path = page_path / "_index.html"
path = f"{path}/_index.html"
else:
- page_path = settings.PAGES_PATH / f"{path}.html"
+ page_path = settings.EVENTS_PAGES_PATH / f"{path}.html"
path = f"{path}.html"
if not page_path.exists():
raise Http404
+ print(f"events/{settings.EVENTS_PAGES_PATH.name}/{path}")
- return [f"events/{settings.PAGES_PATH.name}/{path}"]
+ return [f"events/{settings.EVENTS_PAGES_PATH.name}/{path}"]
diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 3abf556a..e7bf2a79 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -119,9 +119,6 @@ MIDDLEWARE = [
]
ROOT_URLCONF = 'pydis_site.urls'
-# Path for events pages
-PAGES_PATH = Path(BASE_DIR, "pydis_site", "templates", "events", "pages")
-
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -287,4 +284,8 @@ SITE_REPOSITORY_OWNER = "python-discord"
SITE_REPOSITORY_NAME = "site"
SITE_REPOSITORY_BRANCH = "master"
-PAGES_PATH = Path(BASE_DIR, "pydis_site", "apps", "content", "resources")
+# Path for events pages
+EVENTS_PAGES_PATH = Path(BASE_DIR, "pydis_site", "templates", "events", "pages")
+
+# Path for content pages
+CONTENT_PAGES_PATH = Path(BASE_DIR, "pydis_site", "apps", "content", "resources")