From 805510c0f69609f438b5ed9085a649e2de528e17 Mon Sep 17 00:00:00 2001 From: "Adrian A. Baumann" Date: Sun, 28 Dec 2025 22:58:01 +0100 Subject: [PATCH 1/3] Stay on form after adding things --- boxes/templates/boxes/add_things.html | 6 ++++++ boxes/views.py | 13 +++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/boxes/templates/boxes/add_things.html b/boxes/templates/boxes/add_things.html index 733d9f0..4727952 100644 --- a/boxes/templates/boxes/add_things.html +++ b/boxes/templates/boxes/add_things.html @@ -210,6 +210,12 @@ {% endif %} + + {% if success_message %} +
+ {{ success_message }} +
+ {% endif %} diff --git a/boxes/views.py b/boxes/views.py index 2c8db81..de6e8d8 100644 --- a/boxes/views.py +++ b/boxes/views.py @@ -62,6 +62,8 @@ def add_things(request, box_id): """Add multiple things to a box at once.""" box = get_object_or_404(Box, pk=box_id) + success_message = None + if request.method == 'POST': formset = ThingFormSet(request.POST) @@ -73,17 +75,12 @@ def add_things(request, box_id): thing.box = box thing.save() created_count += 1 - print(f'DEBUG: created_count={created_count}') if created_count > 0: - print(f'DEBUG: Redirecting to box_detail with box_id={box_id}') - return redirect('box_detail', box_id=box_id) - else: - print('DEBUG: No valid data submitted') - - else: - formset = ThingFormSet() + success_message = f'Added {created_count} thing{"s" if created_count > 1 else ""} successfully.' + formset = ThingFormSet() return render(request, 'boxes/add_things.html', { 'box': box, 'formset': formset, + 'success_message': success_message, }) -- 2.51.0 From 2295c6f3da0f02e2f080669deee47d7a4f8b9697 Mon Sep 17 00:00:00 2001 From: "Adrian A. Baumann" Date: Sun, 28 Dec 2025 23:04:59 +0100 Subject: [PATCH 2/3] Increase textarea rows for better error display --- boxes/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boxes/forms.py b/boxes/forms.py index e0945d0..c5a8093 100644 --- a/boxes/forms.py +++ b/boxes/forms.py @@ -12,7 +12,7 @@ class ThingForm(forms.ModelForm): widgets = { 'name': forms.TextInput(attrs={'class': 'form-control'}), 'thing_type': forms.Select(attrs={'class': 'form-control'}), - 'description': forms.Textarea(attrs={'class': 'form-control', 'rows': 2}), + 'description': forms.Textarea(attrs={'class': 'form-control', 'rows': 4}), } -- 2.51.0 From 6aeaead306a956cd7ee4806c4e189de5d7f477a6 Mon Sep 17 00:00:00 2001 From: "Adrian A. Baumann" Date: Sun, 28 Dec 2025 23:10:24 +0100 Subject: [PATCH 3/3] Fix error message rendering in add things form Remove inner loop that was iterating over error message characters, causing error messages to display as individual letters. Bump container version to 0.025 --- argocd/deployment.yaml | 2 +- boxes/templates/boxes/add_things.html | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/argocd/deployment.yaml b/argocd/deployment.yaml index 1f74c74..7263556 100644 --- a/argocd/deployment.yaml +++ b/argocd/deployment.yaml @@ -27,7 +27,7 @@ spec: mountPath: /data containers: - name: web - image: git.baumann.gr/adebaumann/labhelper:0.024 + image: git.baumann.gr/adebaumann/labhelper:0.025 imagePullPolicy: Always ports: - containerPort: 8000 diff --git a/boxes/templates/boxes/add_things.html b/boxes/templates/boxes/add_things.html index 4727952..5b931a9 100644 --- a/boxes/templates/boxes/add_things.html +++ b/boxes/templates/boxes/add_things.html @@ -162,9 +162,7 @@ {{ form.name }} {% for error in form.name.errors %}
- {% for e in error %} -
  • {{ e }}
  • - {% endfor %} +
  • {{ error }}
  • {% endfor %} @@ -173,9 +171,7 @@ {{ form.thing_type }} {% for error in form.thing_type.errors %}
    - {% for e in error %} -
  • {{ e }}
  • - {% endfor %} +
  • {{ error }}
  • {% endfor %} @@ -184,9 +180,7 @@ {{ form.description }} {% for error in form.description.errors %}
    - {% for e in error %} -
  • {{ e }}
  • - {% endfor %} +
  • {{ error }}
  • {% endfor %} @@ -194,9 +188,7 @@ {{ form.picture }} {% for error in form.picture.errors %}
    - {% for e in error %} -
  • {{ e }}
  • - {% endfor %} +
  • {{ error }}
  • {% endfor %} -- 2.51.0