aboutsummaryrefslogtreecommitdiffstats
path: root/servo/views
diff options
context:
space:
mode:
authorFilipp Lepalaan <filipp@mac.com>2016-11-02 21:24:52 +0200
committerFilipp Lepalaan <filipp@mac.com>2016-11-02 21:24:52 +0200
commitda1014421d0fffa146a6ee581a9c522c84b8c1fe (patch)
tree0522981df0ad95124b933834e4a32f89f474f9ca /servo/views
parent9bf45810ca9729fac51d796651a310a07d7b92cf (diff)
downloadServo-da1014421d0fffa146a6ee581a9c522c84b8c1fe.tar.gz
Servo-da1014421d0fffa146a6ee581a9c522c84b8c1fe.tar.bz2
Servo-da1014421d0fffa146a6ee581a9c522c84b8c1fe.zip
Cleanup
Diffstat (limited to 'servo/views')
-rw-r--r--servo/views/checkin.py6
-rw-r--r--servo/views/gsx.py8
2 files changed, 6 insertions, 8 deletions
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'))