Fixed slash end of calendar urls. Fixed error message for incorrect year

This commit is contained in:
2022-11-03 12:21:09 +03:00
parent 6fd805ae9c
commit b7c554b67f
2 changed files with 17 additions and 14 deletions
+2 -2
View File
@@ -4,7 +4,7 @@ from . import views
urlpatterns = [ urlpatterns = [
path('', views.index, name='index'), path('', views.index, name='index'),
path('<int:year>', views.year_page, name='index'), path('<int:year>/', views.year_page, name='index'),
path('<int:year>/<int:month>/<int:day>', views.day_page, name='index'), path('<int:year>/<int:month>/<int:day>/', views.day_page, name='index'),
] ]
+15 -12
View File
@@ -81,23 +81,26 @@ def day_page(request, year: int, month: int, day: int):
def year_page(request, year: int): def year_page(request, year: int):
params = None
try: try:
year_data = YearData.objects.get(number=year) year_data = YearData.objects.get(number=year)
except YearData.DoesNotExist: except YearData.DoesNotExist:
return HttpResponseNotFound('<h1>404 Not Found</h1>') params = {'type': 'error', 'error_type': 'year'}
month_data = MonthData.objects.all().order_by('number') if not params:
calendar_data = CalendarData.objects.first() month_data = MonthData.objects.all().order_by('number')
events = Event.objects.all() calendar_data = CalendarData.objects.first()
events = Event.objects.all()
params = { params = {
'type': 'year', 'type': 'year',
'calendar_data': calendar_data, 'calendar_data': calendar_data,
'year_data': year_data, 'year_data': year_data,
'month_data': month_data, 'month_data': month_data,
'month_days': tuple(i+1 for i in range(30)), 'month_days': tuple(i+1 for i in range(30)),
'events': events, 'events': events,
} }
return render(request, 'faerun_calendar/index.html', params) return render(request, 'faerun_calendar/index.html', params)