From 021fede771653fb564e3a4ff36c29a9c1ee32916 Mon Sep 17 00:00:00 2001 From: Tony Date: Fri, 12 Nov 2021 14:10:56 -0600 Subject: [PATCH] fixes exposed by tests --- events/templates/events/schedule.html | 2 +- events/views.py | 7 ++++++- players/views.py | 8 +++++--- teams/views.py | 3 ++- templates/success.html | 10 ++++++---- venues/views.py | 3 ++- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/events/templates/events/schedule.html b/events/templates/events/schedule.html index 295dc52..bb542e0 100644 --- a/events/templates/events/schedule.html +++ b/events/templates/events/schedule.html @@ -8,7 +8,7 @@ {{ event.start|date:"l, F j, Y g:i A" }}
{{ event.venue.name }}
Edit Event Details - Edit Lineup + Edit Lineup {% endfor %} diff --git a/events/views.py b/events/views.py index 092ad15..db01cba 100644 --- a/events/views.py +++ b/events/views.py @@ -1,4 +1,6 @@ from django.shortcuts import render, redirect, get_object_or_404 +from django.http import HttpResponse +from django.urls import reverse from .models import Event from .forms import EventForm from django.http import HttpResponse @@ -24,8 +26,11 @@ def edit(request, id=0): # process the data in form.cleaned_data as required # ... # redirect to a new URL: + if id == 0: id = None new_event, did_create = Event.objects.update_or_create(pk=id, defaults=form.cleaned_data) - return render(request, 'success.html', {'call_back':'schedule'}) + return render(request, 'success.html', {'call_back':reverse('schedule'),'id':new_event.id}, status=201 if did_create else 200) + else: + return HttpResponse(status=400) # if a GET (or any other method) we'll create a blank form else: diff --git a/players/views.py b/players/views.py index 6dbee85..5ffb8d1 100644 --- a/players/views.py +++ b/players/views.py @@ -1,5 +1,6 @@ from django.shortcuts import render, redirect, get_object_or_404 from django.http import HttpResponse +from django.urls import reverse from .models import Player from .forms import PlayerForm @@ -30,10 +31,11 @@ def edit(request, id=0): # check whether it's valid: if form.is_valid(): # process the data in form.cleaned_data as required - # ... - # redirect to a new URL: + if id == 0: id = None new_player, did_create = Player.objects.update_or_create(pk=id, defaults=form.cleaned_data) - return render(request, 'success.html', {'call_back':'players list'}) + return render(request, 'success.html', {'call_back':reverse('players list'),'id':new_player.id}, status=201 if did_create else 200) + else: + return HttpResponse(status=400) # if a GET (or any other method) we'll create a blank form else: diff --git a/teams/views.py b/teams/views.py index 3476936..f78fbf1 100644 --- a/teams/views.py +++ b/teams/views.py @@ -1,5 +1,6 @@ from django.shortcuts import render, redirect, get_object_or_404 from django.http import HttpResponse +from django.urls import reverse from .forms import TeamForm from .models import Team @@ -31,7 +32,7 @@ def edit(request, id=0): # ... # redirect to a new URL: new_team, did_create = Team.objects.update_or_create(pk=id, defaults=form.cleaned_data) - return render(request, 'success.html', {'call_back':'teams list'}) + return render(request, 'success.html', {'call_back_url':reverse('teams list'), 'id':new_team.id},status=201 if did_create else 200) # if a GET (or any other method) we'll create a blank form else: diff --git a/templates/success.html b/templates/success.html index 84c76cd..0407c60 100644 --- a/templates/success.html +++ b/templates/success.html @@ -3,10 +3,12 @@ {% block content %} - - - + -Success! Redirecting... + + + + + Success! Redirecting... {% endblock %} \ No newline at end of file diff --git a/venues/views.py b/venues/views.py index 4458eb3..6b0884d 100644 --- a/venues/views.py +++ b/venues/views.py @@ -1,5 +1,6 @@ from django.shortcuts import render, redirect, get_object_or_404 from django.http import HttpResponse, HttpResponseBadRequest +from django.urls import reverse from .models import Venue from .forms import VenueForm @@ -32,7 +33,7 @@ def edit(request, id=0): # ... # redirect to a new URL: new_venue, did_create = Venue.objects.update_or_create(pk=id, defaults=form.cleaned_data) - return render(request, 'success.html', {'call_back':'players list','id':new_venue.id}, status=201 if did_create else 200) + return render(request, 'success.html', {'call_back_url':reverse('venues list'), 'id':new_venue.id}, status=201 if did_create else 200) return HttpResponseBadRequest() # if a GET (or any other method) we'll create a blank form