here we go

rides/views.py

@@ -1,37 +1,36 @@
-from django.views.generic import DetailView, ListView, CreateView
+from django.views.generic import DetailView, ListView, CreateView, UpdateView
 from django.shortcuts import get_object_or_404
 from django.core.serializers.json import DjangoJSONEncoder
 from django.urls import reverse
 from django.db.models import Q
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.contenttypes.models import ContentType
+from django.contrib import messages
 from django.http import JsonResponse, HttpResponseRedirect
 from .models import Ride, RollerCoasterStats
+from .forms import RideForm
 from parks.models import Park
 from core.views import SlugRedirectMixin
-from moderation.mixins import EditSubmissionMixin, PhotoSubmissionMixin, InlineEditMixin, HistoryMixin
+from moderation.mixins import EditSubmissionMixin, PhotoSubmissionMixin, HistoryMixin
 from moderation.models import EditSubmission
 
 class RideCreateView(LoginRequiredMixin, CreateView):
     model = Ride
+    form_class = RideForm
     template_name = 'rides/ride_form.html'
-    fields = ['name', 'park_area', 'category', 'manufacturer', 'model_name', 'status',
-             'opening_date', 'closing_date', 'status_since', 'min_height_in', 'max_height_in',
-             'accessibility_options', 'capacity_per_hour', 'ride_duration_seconds', 'description']
 
     def setup(self, request, *args, **kwargs):
         super().setup(request, *args, **kwargs)
         self.park = get_object_or_404(Park, slug=self.kwargs['park_slug'])
 
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs['park'] = self.park
+        return kwargs
+
     def form_valid(self, form):
         form.instance.park = self.park
         
-        # If user is moderator or above, save directly
-        if self.request.user.role in ['MODERATOR', 'ADMIN', 'SUPERUSER']:
-            self.object = form.save()
-            return HttpResponseRedirect(self.get_success_url())
-        
-        # Otherwise, create a submission
         cleaned_data = form.cleaned_data.copy()
         cleaned_data['park'] = self.park.id
         # Convert model instances to IDs for JSON serialization
@@ -40,6 +39,7 @@ class RideCreateView(LoginRequiredMixin, CreateView):
         if cleaned_data.get('manufacturer'):
             cleaned_data['manufacturer'] = cleaned_data['manufacturer'].id
 
+        # Create submission record
         submission = EditSubmission.objects.create(
             user=self.request.user,
             content_type=ContentType.objects.get_for_model(Ride),
@@ -48,6 +48,18 @@ class RideCreateView(LoginRequiredMixin, CreateView):
             reason=self.request.POST.get('reason', ''),
             source=self.request.POST.get('source', '')
         )
+        
+        # If user is moderator or above, auto-approve
+        if self.request.user.role in ['MODERATOR', 'ADMIN', 'SUPERUSER']:
+            self.object = form.save()
+            submission.object_id = self.object.id
+            submission.status = 'APPROVED'
+            submission.handled_by = self.request.user
+            submission.save()
+            messages.success(self.request, f'Successfully created {self.object.name}')
+            return HttpResponseRedirect(self.get_success_url())
+        
+        messages.success(self.request, 'Your ride submission has been sent for review')
         return HttpResponseRedirect(reverse('parks:rides:ride_list', kwargs={'park_slug': self.park.slug}))
 
     def get_success_url(self):
@@ -61,7 +73,69 @@ class RideCreateView(LoginRequiredMixin, CreateView):
         context['park'] = self.park
         return context
 
-class RideDetailView(SlugRedirectMixin, EditSubmissionMixin, PhotoSubmissionMixin, InlineEditMixin, HistoryMixin, DetailView):
+class RideUpdateView(LoginRequiredMixin, UpdateView):
+    model = Ride
+    form_class = RideForm
+    template_name = 'rides/ride_form.html'
+    slug_url_kwarg = 'ride_slug'
+
+    def setup(self, request, *args, **kwargs):
+        super().setup(request, *args, **kwargs)
+        self.park = get_object_or_404(Park, slug=self.kwargs['park_slug'])
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs['park'] = self.park
+        return kwargs
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['park'] = self.park
+        context['is_edit'] = True
+        return context
+
+    def form_valid(self, form):
+        cleaned_data = form.cleaned_data.copy()
+        cleaned_data['park'] = self.park.id
+        # Convert model instances to IDs for JSON serialization
+        if cleaned_data.get('park_area'):
+            cleaned_data['park_area'] = cleaned_data['park_area'].id
+        if cleaned_data.get('manufacturer'):
+            cleaned_data['manufacturer'] = cleaned_data['manufacturer'].id
+
+        # Create submission record
+        submission = EditSubmission.objects.create(
+            user=self.request.user,
+            content_type=ContentType.objects.get_for_model(Ride),
+            object_id=self.object.id,
+            submission_type='EDIT',
+            changes=cleaned_data,
+            reason=self.request.POST.get('reason', ''),
+            source=self.request.POST.get('source', '')
+        )
+
+        # If user is moderator or above, auto-approve
+        if self.request.user.role in ['MODERATOR', 'ADMIN', 'SUPERUSER']:
+            self.object = form.save()
+            submission.status = 'APPROVED'
+            submission.handled_by = self.request.user
+            submission.save()
+            messages.success(self.request, f'Successfully updated {self.object.name}')
+            return HttpResponseRedirect(self.get_success_url())
+        
+        messages.success(self.request, f'Your changes to {self.object.name} have been sent for review')
+        return HttpResponseRedirect(reverse('parks:rides:ride_detail', kwargs={
+            'park_slug': self.park.slug,
+            'ride_slug': self.object.slug
+        }))
+
+    def get_success_url(self):
+        return reverse('parks:rides:ride_detail', kwargs={
+            'park_slug': self.park.slug,
+            'ride_slug': self.object.slug
+        })
+
+class RideDetailView(SlugRedirectMixin, EditSubmissionMixin, PhotoSubmissionMixin, HistoryMixin, DetailView):
     model = Ride
     template_name = 'rides/ride_detail.html'
     context_object_name = 'ride'