Use get_object_or_404
This commit is contained in:
parent
a6796275b8
commit
8ae05c1350
|
@ -61,10 +61,7 @@ def register(request):
|
||||||
if not invite_code:
|
if not invite_code:
|
||||||
raise PermissionDenied
|
raise PermissionDenied
|
||||||
|
|
||||||
try:
|
invite = get_object_or_404(models.SiteInvite, code=invite_code)
|
||||||
invite = models.SiteInvite.objects.get(code=invite_code)
|
|
||||||
except models.SiteInvite.DoesNotExist:
|
|
||||||
raise PermissionDenied
|
|
||||||
else:
|
else:
|
||||||
invite = None
|
invite = None
|
||||||
|
|
||||||
|
@ -234,10 +231,7 @@ def edit_book(request, book_id):
|
||||||
if not request.method == 'POST':
|
if not request.method == 'POST':
|
||||||
return redirect('/book/%s' % book_id)
|
return redirect('/book/%s' % book_id)
|
||||||
|
|
||||||
try:
|
book = get_object_or_404(models.Edition, id=book_id)
|
||||||
book = models.Edition.objects.get(id=book_id)
|
|
||||||
except models.Edition.DoesNotExist:
|
|
||||||
return HttpResponseNotFound()
|
|
||||||
|
|
||||||
form = forms.EditionForm(request.POST, request.FILES, instance=book)
|
form = forms.EditionForm(request.POST, request.FILES, instance=book)
|
||||||
if not form.is_valid():
|
if not form.is_valid():
|
||||||
|
@ -251,14 +245,10 @@ def edit_book(request, book_id):
|
||||||
@login_required
|
@login_required
|
||||||
def upload_cover(request, book_id):
|
def upload_cover(request, book_id):
|
||||||
''' upload a new cover '''
|
''' upload a new cover '''
|
||||||
# TODO: alternate covers?
|
|
||||||
if not request.method == 'POST':
|
if not request.method == 'POST':
|
||||||
return redirect('/book/%s' % request.user.localname)
|
return redirect('/book/%s' % request.user.localname)
|
||||||
|
|
||||||
try:
|
book = get_object_or_404(models.Edition, id=book_id)
|
||||||
book = models.Edition.objects.get(id=book_id)
|
|
||||||
except models.Edition.DoesNotExist:
|
|
||||||
return HttpResponseNotFound()
|
|
||||||
|
|
||||||
form = forms.CoverForm(request.POST, request.FILES, instance=book)
|
form = forms.CoverForm(request.POST, request.FILES, instance=book)
|
||||||
if not form.is_valid():
|
if not form.is_valid():
|
||||||
|
@ -442,10 +432,8 @@ def edit_readthrough(request):
|
||||||
@login_required
|
@login_required
|
||||||
def delete_readthrough(request):
|
def delete_readthrough(request):
|
||||||
''' remove a readthrough '''
|
''' remove a readthrough '''
|
||||||
try:
|
readthrough = get_object_or_404(
|
||||||
readthrough = models.ReadThrough.objects.get(id=request.POST.get('id'))
|
models.ReadThrough, id=request.POST.get('id'))
|
||||||
except models.ReadThrough.DoesNotExist:
|
|
||||||
return HttpResponseNotFound()
|
|
||||||
|
|
||||||
# don't let people edit other people's data
|
# don't let people edit other people's data
|
||||||
if request.user != readthrough.user:
|
if request.user != readthrough.user:
|
||||||
|
@ -506,10 +494,7 @@ def tag(request):
|
||||||
# field which doesn't validate
|
# field which doesn't validate
|
||||||
name = request.POST.get('name')
|
name = request.POST.get('name')
|
||||||
book_id = request.POST.get('book')
|
book_id = request.POST.get('book')
|
||||||
try:
|
book = get_object_or_404(models.Edition, id=book_id)
|
||||||
book = models.Edition.objects.get(id=book_id)
|
|
||||||
except models.Edition.DoesNotExist:
|
|
||||||
return HttpResponseNotFound()
|
|
||||||
tag_obj, created = models.Tag.objects.get_or_create(
|
tag_obj, created = models.Tag.objects.get_or_create(
|
||||||
name=name,
|
name=name,
|
||||||
book=book,
|
book=book,
|
||||||
|
@ -569,10 +554,7 @@ def delete_status(request):
|
||||||
status_id = request.POST.get('status')
|
status_id = request.POST.get('status')
|
||||||
if not status_id:
|
if not status_id:
|
||||||
return HttpResponseBadRequest()
|
return HttpResponseBadRequest()
|
||||||
try:
|
status = get_object_or_404(models.Status, id=status_id)
|
||||||
status = models.Status.objects.get(id=status_id)
|
|
||||||
except models.Status.DoesNotExist:
|
|
||||||
return HttpResponseBadRequest()
|
|
||||||
|
|
||||||
# don't let people delete other people's statuses
|
# don't let people delete other people's statuses
|
||||||
if status.user != request.user:
|
if status.user != request.user:
|
||||||
|
|
Loading…
Reference in New Issue