From 07a879d10f5d1655d607f0699960f8ca06ccd274 Mon Sep 17 00:00:00 2001 From: Mathias Magnusson Date: Mon, 15 Jul 2024 20:03:25 +0200 Subject: [PATCH] Fix #193 & some more bugfixes The link @Herkarl sent here: https://github.com/datasektionen/cashflow/pull/192#pullrequestreview-2113934395 was correct and the code snippet was almost correct --- invoices/views.py | 7 ++----- templates/invoices/new.html | 8 ++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/invoices/views.py b/invoices/views.py index 97b3ea7..837de0c 100644 --- a/invoices/views.py +++ b/invoices/views.py @@ -2,6 +2,7 @@ from django.http import Http404, HttpResponseRedirect, HttpResponseBadRequest, HttpResponseForbidden, HttpResponseServerError, JsonResponse from django.views.decorators.http import require_http_methods, require_GET, require_POST from django.contrib.auth.decorators import login_required, user_passes_test +from django.contrib import messages from datetime import date, datetime from django.urls import reverse from django.core.exceptions import ObjectDoesNotExist @@ -33,11 +34,7 @@ def new_invoice(request): messages.error(request, 'Du har angivit en icke-positiv summa i någon av fakturadelarna') valid = False - if len(request.POST.getlist('amounts[]')) != len(request.POST.getlist('budgetLine[]')): - messages.error(request, 'Sluta fippla') - valid = False - - if len(request.POST.getlist('budgetLine[]')) == 0: + if len(request.POST.getlist('budgetLines[]')) == 0: messages.error(request, 'Du måste lägga till minst en del på kvittot') valid = False diff --git a/templates/invoices/new.html b/templates/invoices/new.html index 0eb9414..d61ecd7 100644 --- a/templates/invoices/new.html +++ b/templates/invoices/new.html @@ -5,6 +5,14 @@ {% block full_content %}
+ {% if messages %} + + {% endif %} +

Ladda endast upp en faktura i taget.