lostplaces/lostplaces_app/forms.py

@@ -22,10 +22,11 @@ class PlaceForm(forms.ModelForm):
 class PlaceImageCreateForm(forms.ModelForm):
     class Meta:
         model = PlaceImage
-        fields = ['filename']
+        fields = '__all__'
+        exclude = ['submitted_by', 'place', 'description']
         widgets = {
-            'filename': forms.ClearableFileInput(attrs={'multiple': True})
-        }
+            'filename': forms.ClearableFileInput(attrs={'multiple': True}),
+        },
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

lostplaces/lostplaces_app/templates/update_place.html

@@ -1,15 +0,0 @@
-{% extends 'global.html'%}
-{% load static %}
-
-# {% block title %}Place erstellen{% endblock %}
-
-{% block maincontent %}
-
-<h2>Place aktualisieren</h2>
-<form method="post" enctype="multipart/form-data">
-  {% csrf_token %}
-  {{ form.as_p }}
-  <button type="submit">Abschicken</button>
-</form>
-
-{% endblock maincontent %}

lostplaces/lostplaces_app/urls.py

@@ -1,18 +1,11 @@
 from django.urls import path
-from .views import (
-    hello_world, 
-    place_detail_view, 
-    place_list_view, 
-    SignUpView, 
-    PlaceCreateView,
-    PlaceUpdateView
-)
+from .views import hello_world, place_detail_view, place_list_view, SignUpView, PlaceEditView
 
 urlpatterns = [
     path('hello_world/', hello_world), # You know what this is :P
     path('signup/', SignUpView.as_view(), name='signup'),
     path('place/<int:pk>/', place_detail_view, name='place_detail'),
-    path('place/create/', PlaceCreateView.as_view(), name='place_create'),
-    path('place/update/<int:pk>/', PlaceUpdateView.as_view(), name='place_edit'),
+    path('place/create/', PlaceEditView.as_view(), name='place_create'),
+    path('place/edit/<int:pk>/', PlaceEditView.as_view(), name='place_edit'),
     path('place/', place_list_view, name='place_list')
 ]

lostplaces/lostplaces_app/views.py

@@ -2,9 +2,6 @@ from django.shortcuts import render, redirect, get_object_or_404
 from django.urls import reverse_lazy
 from django.views.generic.edit import CreateView
 from django.views import View
-from django.http import Http404
-from django.views.generic.edit import UpdateView
-
 
 from .forms import ExplorerCreationForm, PlaceForm, PlaceImageCreateForm
 from .models import Place, PlaceImage
@@ -25,19 +22,16 @@ def place_detail_view(request, pk):
 def hello_world(request):
     return render(request, 'hello_world.html', {'text':'Hello World!'})
 
-class PlaceUpdateView(UpdateView):
-    template_name = 'update_place.html'
-    model = Place
-    form_class = PlaceForm
-
-    def get_success_url(self):
-        return reverse_lazy('place_detail', kwargs={'pk':self.get_object().pk})
-
-class PlaceCreateView(View):
+class PlaceEditView(View):
 
     def get(self, request, *args, **kwargs):
         place_image_form = PlaceImageCreateForm()
-        place_form = PlaceForm()
+
+        if 'pk' in kwargs:
+            place = get_object_or_404(Place,pk=kwargs['pk'])
+            place_form = PlaceForm(instance=place)
+        else:
+            place_form = PlaceForm()
 
         context = {
             'place_form': place_form,
@@ -57,9 +51,9 @@ class PlaceCreateView(View):
 
             if request.FILES:
                 self._apply_multipart_image_upload(
-                    files=request.FILES.getlist('filename'),
-                    place=place, 
-                    submitter=submitter
+                    request.FILES.getlist('filename'),
+                    place, 
+                    submitter
                 )
             
             kwargs_to_pass = {
@@ -73,7 +67,6 @@ class PlaceCreateView(View):
             return render(request, 'create_place.html', context)
 
     def _apply_multipart_image_upload(self, files, place, submitter):
-        print(files)
         for image in files:
             place_image = PlaceImage.objects.create(
                 filename=image,