update urls mainly, fix domain.com/rides to work still needs done, filtering

rides/views.py

@@ -15,11 +15,17 @@ from moderation.models import EditSubmission
 class RideCreateView(LoginRequiredMixin, CreateView):
     model = Ride
     template_name = 'rides/ride_form.html'
-    fields = ['name', 'park', 'park_area', 'category', 'manufacturer', 'model_name', 'status',
+    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 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()
@@ -27,9 +33,8 @@ class RideCreateView(LoginRequiredMixin, CreateView):
         
         # Otherwise, create a submission
         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'):
-            cleaned_data['park'] = cleaned_data['park'].id
         if cleaned_data.get('park_area'):
             cleaned_data['park_area'] = cleaned_data['park_area'].id
         if cleaned_data.get('manufacturer'):
@@ -43,14 +48,19 @@ class RideCreateView(LoginRequiredMixin, CreateView):
             reason=self.request.POST.get('reason', ''),
             source=self.request.POST.get('source', '')
         )
-        return HttpResponseRedirect(reverse('ride_list'))
+        return HttpResponseRedirect(reverse('parks:rides:ride_list', kwargs={'park_slug': self.park.slug}))
 
     def get_success_url(self):
-        return reverse('ride_detail', kwargs={
-            'park_slug': self.object.park.slug,
+        return reverse('parks:rides:ride_detail', kwargs={
+            'park_slug': self.park.slug,
             'ride_slug': self.object.slug
         })
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['park'] = self.park
+        return context
+
 class RideDetailView(SlugRedirectMixin, EditSubmissionMixin, PhotoSubmissionMixin, InlineEditMixin, HistoryMixin, DetailView):
     model = Ride
     template_name = 'rides/ride_detail.html'
@@ -75,7 +85,7 @@ class RideDetailView(SlugRedirectMixin, EditSubmissionMixin, PhotoSubmissionMixi
         return context
 
     def get_redirect_url_pattern(self):
-        return 'ride_detail'
+        return 'parks:rides:ride_detail'
 
     def get_redirect_url_kwargs(self):
         return {
@@ -88,36 +98,52 @@ class RideListView(ListView):
     template_name = 'rides/ride_list.html'
     context_object_name = 'rides'
 
+    def setup(self, request, *args, **kwargs):
+        super().setup(request, *args, **kwargs)
+        self.park = None
+        if 'park_slug' in self.kwargs:
+            self.park = get_object_or_404(Park, slug=self.kwargs['park_slug'])
+
     def get_queryset(self):
         queryset = Ride.objects.select_related('park', 'coaster_stats', 'manufacturer').prefetch_related('photos')
         
+        # Filter by park if viewing park-specific rides
+        if self.park:
+            queryset = queryset.filter(park=self.park)
+        
         search = self.request.GET.get('search', '').strip() or None
         category = self.request.GET.get('category', '').strip() or None
         status = self.request.GET.get('status', '').strip() or None
         manufacturer = self.request.GET.get('manufacturer', '').strip() or None
         
         if search:
-            queryset = queryset.filter(
-                Q(name__icontains=search) | 
-                Q(park__name__icontains=search)
-            )
+            if self.park:
+                queryset = queryset.filter(name__icontains=search)
+            else:
+                queryset = queryset.filter(
+                    Q(name__icontains=search) | 
+                    Q(park__name__icontains=search)
+                )
         if category:
             queryset = queryset.filter(category=category)
         if status:
             queryset = queryset.filter(status=status)
         if manufacturer:
-            # Example: Exclude null manufacturers in RideListView
-            queryset = Ride.objects.exclude(manufacturer__isnull=True)
+            queryset = queryset.exclude(manufacturer__isnull=True)
         
         return queryset
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
+        context['park'] = self.park
 
-        # Exclude cases where manufacturer is null or an empty string
+        # Get manufacturers for the filter dropdown
+        manufacturer_query = Ride.objects
+        if self.park:
+            manufacturer_query = manufacturer_query.filter(park=self.park)
+        
         context['manufacturers'] = list(
-            Ride.objects.exclude(manufacturer__isnull=True)
-                .exclude(manufacturer__isnull=True)
+            manufacturer_query.exclude(manufacturer__isnull=True)
                 .values_list('manufacturer__name', flat=True)
                 .distinct().order_by('manufacturer__name')
         )