fixes exposed by tests

This commit is contained in:
2021-11-12 14:10:56 -06:00
parent 4460032a40
commit 021fede771
6 changed files with 22 additions and 11 deletions

View File

@@ -8,7 +8,7 @@
{{ event.start|date:"l, F j, Y g:i A" }} <br> {{ event.start|date:"l, F j, Y g:i A" }} <br>
{{ event.venue.name }} <br> {{ event.venue.name }} <br>
<a class="btn btn-primary btn-sm" href="{% url 'edit event' event.id%}" role="button">Edit Event Details</a> <a class="btn btn-primary btn-sm" href="{% url 'edit event' event.id%}" role="button">Edit Event Details</a>
<a class="btn btn-primary btn-sm" href="{% url 'edit lineup' event.id%}" role="button">Edit Lineup</a> <a class="btn btn-primary btn-sm" href="{% url 'edit lineup' event_id=event.id%}" role="button">Edit Lineup</a>
</li> </li>
{% endfor %} {% endfor %}
</ol> </ol>

View File

@@ -1,4 +1,6 @@
from django.shortcuts import render, redirect, get_object_or_404 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 .models import Event
from .forms import EventForm from .forms import EventForm
from django.http import HttpResponse from django.http import HttpResponse
@@ -24,8 +26,11 @@ def edit(request, id=0):
# process the data in form.cleaned_data as required # process the data in form.cleaned_data as required
# ... # ...
# redirect to a new URL: # 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) 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 # if a GET (or any other method) we'll create a blank form
else: else:

View File

@@ -1,5 +1,6 @@
from django.shortcuts import render, redirect, get_object_or_404 from django.shortcuts import render, redirect, get_object_or_404
from django.http import HttpResponse from django.http import HttpResponse
from django.urls import reverse
from .models import Player from .models import Player
from .forms import PlayerForm from .forms import PlayerForm
@@ -30,10 +31,11 @@ def edit(request, id=0):
# check whether it's valid: # check whether it's valid:
if form.is_valid(): if form.is_valid():
# process the data in form.cleaned_data as required # process the data in form.cleaned_data as required
# ... if id == 0: id = None
# redirect to a new URL:
new_player, did_create = Player.objects.update_or_create(pk=id, defaults=form.cleaned_data) 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 # if a GET (or any other method) we'll create a blank form
else: else:

View File

@@ -1,5 +1,6 @@
from django.shortcuts import render, redirect, get_object_or_404 from django.shortcuts import render, redirect, get_object_or_404
from django.http import HttpResponse from django.http import HttpResponse
from django.urls import reverse
from .forms import TeamForm from .forms import TeamForm
from .models import Team from .models import Team
@@ -31,7 +32,7 @@ def edit(request, id=0):
# ... # ...
# redirect to a new URL: # redirect to a new URL:
new_team, did_create = Team.objects.update_or_create(pk=id, defaults=form.cleaned_data) 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 # if a GET (or any other method) we'll create a blank form
else: else:

View File

@@ -3,10 +3,12 @@
{% block content %} {% block content %}
<head> <head>
<meta http-equiv="refresh" content="2;url={% url call_back %}" />
</head>
<span class="text-success">Success!</span> <span class="text-muted">Redirecting...</span> <meta http-equiv="refresh" content="2;url={{ call_back_url }}" />
</head>
<span class="text-success">Success!</span> <span class="text-muted">Redirecting...</span>
{% endblock %} {% endblock %}

View File

@@ -1,5 +1,6 @@
from django.shortcuts import render, redirect, get_object_or_404 from django.shortcuts import render, redirect, get_object_or_404
from django.http import HttpResponse, HttpResponseBadRequest from django.http import HttpResponse, HttpResponseBadRequest
from django.urls import reverse
from .models import Venue from .models import Venue
from .forms import VenueForm from .forms import VenueForm
@@ -32,7 +33,7 @@ def edit(request, id=0):
# ... # ...
# redirect to a new URL: # redirect to a new URL:
new_venue, did_create = Venue.objects.update_or_create(pk=id, defaults=form.cleaned_data) 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() return HttpResponseBadRequest()
# if a GET (or any other method) we'll create a blank form # if a GET (or any other method) we'll create a blank form