From da1014421d0fffa146a6ee581a9c522c84b8c1fe Mon Sep 17 00:00:00 2001 From: Filipp Lepalaan Date: Wed, 2 Nov 2016 21:24:52 +0200 Subject: Cleanup --- servo/views/checkin.py | 6 +++--- servo/views/gsx.py | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'servo/views') diff --git a/servo/views/checkin.py b/servo/views/checkin.py index 9d89544..1b8f96e 100644 --- a/servo/views/checkin.py +++ b/servo/views/checkin.py @@ -148,14 +148,14 @@ def init_session(request): except KeyError: # not given - default to session, then auth user user_id = request.session.get('checkin_user', user.pk) - + user = get_object_or_404(User, pk=user_id) request.session['checkin_locations'] = Location.get_checkin_list() checkin_users = User.get_checkin_group() queryset = checkin_users.filter(location=location) request.session['checkin_users'] = User.serialize(queryset) - + request.session['checkin_user'] = user.pk request.session['checkin_location'] = location.pk request.session['checkin_user_name'] = user.get_name() @@ -176,7 +176,7 @@ def thanks(request, order): try: request.session.delete_test_cookie() except KeyError: - pass # ignore spurious KeyError at /checkin/thanks/RJTPS/ + pass # ignore spurious KeyError at /checkin/thanks/RJTPS/ try: order = Order.objects.get(url_code=order) diff --git a/servo/views/gsx.py b/servo/views/gsx.py index 12be6c9..2f0f057 100644 --- a/servo/views/gsx.py +++ b/servo/views/gsx.py @@ -133,11 +133,9 @@ def remove_part(request, repair, part): return render(request, "repairs/delete_part.html", data) -def delete_repair(request, repair_id): - """ - Deletes this unsubmitted GSX repair - """ - repair = get_object_or_404(Repair, pk=repair_id) +def delete_repair(request, pk): + """Delete this unsubmitted GSX repair.""" + repair = get_object_or_404(Repair, pk=pk) if repair.is_submitted(): messages.error(request, _('Submitted repairs cannot be deleted')) -- cgit v1.2.3