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/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}), } diff --git a/boxes/templates/boxes/add_things.html b/boxes/templates/boxes/add_things.html index 733d9f0..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 %} @@ -210,6 +202,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, })