From 43dd06db8582782e74197ede1b9c499f9cd25d53 Mon Sep 17 00:00:00 2001
From: Christian Dresen <c.dresen@fh-muenster.de>
Date: Wed, 30 Nov 2016 19:31:42 +0100
Subject: [PATCH] [WarpFood] Fix Paid toggle unauthenticated, redirect after
order. /close #38 #37
---
www/web/warpfood/templates/warpfood/view.html | 15 +++------------
www/web/warpfood/views.py | 3 ++-
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/www/web/warpfood/templates/warpfood/view.html b/www/web/warpfood/templates/warpfood/view.html
index a7eaae6..7ae747a 100644
--- a/www/web/warpfood/templates/warpfood/view.html
+++ b/www/web/warpfood/templates/warpfood/view.html
@@ -100,19 +100,10 @@
<td>{{ order.price }} €</td>
<td>{{ order.comment }}</td>
<td>
- {% if user.is_authenticated %}
- {% if order.paid %}
- <a class="btn btn-xs btn-success" href="/pizza/toggle_paid/{{ order.id }}">{{ order.paid }}</a>
- {% else %}
- <a class="btn btn-xs btn-danger" href="/pizza/toggle_paid/{{ order.id }}">{{ order.paid }}</a>
- {% endif %}
-
+ {% if order.paid %}
+ <a class="btn btn-xs btn-success" href="/pizza/toggle_paid/{{ order.id }}">{{ order.paid }}</a>
{% else %}
- {% if order.paid %}
- <span class="btn btn-xs btn-success">{{ order.paid }}</span>
- {% else %}
- <span class="btn btn-xs btn-danger">{{ order.paid }}</span>
- {% endif %}
+ <a class="btn btn-xs btn-danger" href="/pizza/toggle_paid/{{ order.id }}">{{ order.paid }}</a>
{% endif %}
</td>
</tr>
diff --git a/www/web/warpfood/views.py b/www/web/warpfood/views.py
index 7bb6fd6..9d4551f 100644
--- a/www/web/warpfood/views.py
+++ b/www/web/warpfood/views.py
@@ -77,7 +77,8 @@ def view(request, sheet_id=0):
p.price = order.price
p.save()
form = None
-
+ redirect("/pizza/view/%s/" % sheet_id)
+
if sheet_id != 0:
sheet = FoodSheet.objects.get(id=sheet_id)
page_context['sheet'] = sheet
--
GitLab