Merge pull request 'Add form to add multiple things to a box' (#1) from feature/boxform into master

Reviewed-on: #1

argocd/deployment.yaml

@@ -27,7 +27,7 @@ spec:
               mountPath: /data
       containers:
         - name: web
-          image: git.baumann.gr/adebaumann/labhelper:0.025
+          image: git.baumann.gr/adebaumann/labhelper:0.024
           imagePullPolicy: Always
           ports:
             - containerPort: 8000

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': 4}),
+            'description': forms.Textarea(attrs={'class': 'form-control', 'rows': 2}),
         }
 
 

boxes/templates/boxes/add_things.html

@@ -162,7 +162,9 @@
                         {{ form.name }}
                         {% for error in form.name.errors %}
                         <div class="error-list">
-                            <li>{{ error }}</li>
+                            {% for e in error %}
+                            <li>{{ e }}</li>
+                            {% endfor %}
                         </div>
                         {% endfor %}
                         <label class="required">*</label>
@@ -171,7 +173,9 @@
                         {{ form.thing_type }}
                         {% for error in form.thing_type.errors %}
                         <div class="error-list">
-                            <li>{{ error }}</li>
+                            {% for e in error %}
+                            <li>{{ e }}</li>
+                            {% endfor %}
                         </div>
                         {% endfor %}
                         <label class="required">*</label>
@@ -180,7 +184,9 @@
                         {{ form.description }}
                         {% for error in form.description.errors %}
                         <div class="error-list">
-                            <li>{{ error }}</li>
+                            {% for e in error %}
+                            <li>{{ e }}</li>
+                            {% endfor %}
                         </div>
                         {% endfor %}
                     </td>
@@ -188,7 +194,9 @@
                         {{ form.picture }}
                         {% for error in form.picture.errors %}
                         <div class="error-list">
-                            <li>{{ error }}</li>
+                            {% for e in error %}
+                            <li>{{ e }}</li>
+                            {% endfor %}
                         </div>
                         {% endfor %}
                     </td>
@@ -202,12 +210,6 @@
             </table>
         </form>
         {% endif %}
-        
-        {% if success_message %}
-        <div class="success-message">
-            {{ success_message }}
-        </div>
-        {% endif %}
     </div>
 </body>
 </html>

boxes/views.py

@@ -62,8 +62,6 @@ 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)
         
@@ -75,12 +73,17 @@ 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:
-                success_message = f'Added {created_count} thing{"s" if created_count > 1 else ""} successfully.'
+                print(f'DEBUG: Redirecting to box_detail with box_id={box_id}')
-            formset = ThingFormSet()
+                return redirect('box_detail', box_id=box_id)
+            else:
+                print('DEBUG: No valid data submitted')
+    
+    else:
+        formset = ThingFormSet()
     
     return render(request, 'boxes/add_things.html', {
         'box': box,
         'formset': formset,
-        'success_message': success_message,
     })