Skip to content

Commit

Permalink
Merge pull request #177 from springload/fix/error-pages
Browse files Browse the repository at this point in the history
make updates/rss work and remove blog/rss
  • Loading branch information
sarahframe authored Aug 26, 2024
2 parents 7053aaa + c723b44 commit 849a7c4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
9 changes: 0 additions & 9 deletions cdhweb/blog/urls.py

This file was deleted.

5 changes: 3 additions & 2 deletions cdhweb/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from cdhweb.context_processors import favicon_path
from cdhweb.pages.views import OpenSearchDescriptionView, SiteSearchView
from cdhweb.events.views import EventIcalView
from cdhweb.blog.views import BlogPostRedirectView
from cdhweb.blog.views import BlogPostRedirectView, RssBlogPostFeed, AtomBlogPostFeed

admin.autodiscover()

Expand All @@ -41,7 +41,6 @@
path("_500/", lambda _: 1 / 0), # for testing 500 error page
# main apps
path("people/", include("cdhweb.people.urls", namespace="people")),
path("blog/", include("cdhweb.blog.urls", namespace="blog")),
path("projects/", include("cdhweb.projects.urls", namespace="projects")),
# search
path("search/", SiteSearchView.as_view(), name="search"),
Expand Down Expand Up @@ -70,6 +69,8 @@
# wagtail paths
path("cms/", include(wagtailadmin_urls)),
path("documents/", include(wagtaildocs_urls)),
path("updates/rss/", RssBlogPostFeed(), name="rss"),
path("updates/atom/", AtomBlogPostFeed(), name="atom"),
re_path(r"updates/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/(?P<slug>[\w-]+)", BlogPostRedirectView.as_view(), name='blog-detail'),
path("updates/<slug>/", BlogPostRedirectView.as_view(), name='blog-detail'),
]
Expand Down

0 comments on commit 849a7c4

Please sign in to comment.