diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e88c4d91..3d404533 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,7 @@ Changelog * Updated translations * Fixed error when page with attached menu without apphook was not working +* Removed the dollar from the routes 2.2.1 (2019-02-12) diff --git a/aldryn_newsblog/urls.py b/aldryn_newsblog/urls.py index 8abe10b2..5d145ce1 100644 --- a/aldryn_newsblog/urls.py +++ b/aldryn_newsblog/urls.py @@ -9,18 +9,17 @@ urlpatterns = [ - url(r'^$', - ArticleList.as_view(), name='article-list'), - url(r'^feed/$', LatestArticlesFeed(), name='article-list-feed'), + url(r'^', ArticleList.as_view(), name='article-list'), + url(r'^feed/', LatestArticlesFeed(), name='article-list-feed'), - url(r'^search/$', + url(r'^search/', ArticleSearchResultsList.as_view(), name='article-search'), - url(r'^(?P\d{4})/$', + url(r'^(?P\d{4})/', YearArticleList.as_view(), name='article-list-by-year'), - url(r'^(?P\d{4})/(?P\d{1,2})/$', + url(r'^(?P\d{4})/(?P\d{1,2})/', MonthArticleList.as_view(), name='article-list-by-month'), - url(r'^(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/$', + url(r'^(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/', DayArticleList.as_view(), name='article-list-by-day'), # Various permalink styles that we support @@ -29,29 +28,28 @@ # NOTE: We cannot support /year/month/pk, /year/pk, or /pk, since these # patterns collide with the list/archive views, which we'd prefer to # continue to support. - url(r'^(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/(?P\d+)/$', + url(r'^(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/(?P\d+)/', ArticleDetail.as_view(), name='article-detail'), # These support permalinks with - url(r'^(?P\w[-\w]*)/$', + url(r'^(?P\w[-\w]*)/', ArticleDetail.as_view(), name='article-detail'), - url(r'^(?P\d{4})/(?P\w[-\w]*)/$', + url(r'^(?P\d{4})/(?P\w[-\w]*)/', ArticleDetail.as_view(), name='article-detail'), - url(r'^(?P\d{4})/(?P\d{1,2})/(?P\w[-\w]*)/$', + url(r'^(?P\d{4})/(?P\d{1,2})/(?P\w[-\w]*)/', ArticleDetail.as_view(), name='article-detail'), - url(r'^(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/(?P\w[-\w]*)/$', # flake8: NOQA + url(r'^(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/(?P\w[-\w]*)/', # flake8: noqa ArticleDetail.as_view(), name='article-detail'), - url(r'^author/(?P\w[-\w]*)/$', + url(r'^author/(?P\w[-\w]*)/', AuthorArticleList.as_view(), name='article-list-by-author'), - url(r'^category/(?P\w[-\w]*)/$', + url(r'^category/(?P\w[-\w]*)/', CategoryArticleList.as_view(), name='article-list-by-category'), - url(r'^category/(?P\w[-\w]*)/feed/$', + url(r'^category/(?P\w[-\w]*)/feed/', CategoryFeed(), name='article-list-by-category-feed'), - url(r'^tag/(?P\w[-\w]*)/$', + url(r'^tag/(?P\w[-\w]*)/', TagArticleList.as_view(), name='article-list-by-tag'), - url(r'^tag/(?P\w[-\w]*)/feed/$', + url(r'^tag/(?P\w[-\w]*)/feed/', TagFeed(), name='article-list-by-tag-feed'), - ]