yay

rides/views.py

@@ -1,5 +1,8 @@
 from django.views.generic import DetailView, ListView
 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 .models import Ride, RollerCoasterStats
 from parks.models import Park
 from core.views import SlugRedirectMixin
@@ -40,31 +43,56 @@ class RideListView(ListView):
     model = Ride
     template_name = 'rides/ride_list.html'
     context_object_name = 'rides'
-    paginate_by = 12
 
     def get_queryset(self):
-        queryset = Ride.objects.select_related('park', 'coaster_stats')
+        queryset = Ride.objects.select_related('park', 'coaster_stats', 'manufacturer').prefetch_related('photos')
         
-        # Filter by category if specified
-        category = self.request.GET.get('category')
+        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 category:
             queryset = queryset.filter(category=category)
-            
-        # Filter by status if specified
-        status = self.request.GET.get('status')
         if status:
             queryset = queryset.filter(status=status)
-            
-        # Filter by manufacturer if specified
-        manufacturer = self.request.GET.get('manufacturer')
         if manufacturer:
-            queryset = queryset.filter(manufacturer=manufacturer)
-            
-        return queryset.order_by('name')
+            # Example: Exclude null manufacturers in RideListView
+            queryset = Ride.objects.exclude(manufacturer__isnull=True)
+        
+        return queryset
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['manufacturers'] = Ride.objects.values_list(
-            'manufacturer', flat=True
-        ).distinct().order_by('manufacturer')
+
+        # Exclude cases where manufacturer is null or an empty string
+        context['manufacturers'] = list(
+            Ride.objects.exclude(manufacturer__isnull=True)
+                .exclude(manufacturer__isnull=True)
+                .values_list('manufacturer__name', flat=True)
+                .distinct().order_by('manufacturer__name')
+        )
+
+        # Add current filter values to context
+        context['current_filters'] = {
+            'search': self.request.GET.get('search', ''),
+            'category': self.request.GET.get('category', ''),
+            'status': self.request.GET.get('status', ''),
+            'manufacturer': self.request.GET.get('manufacturer', '')
+        }
+        
         return context
+
+
+
+    def get(self, request, *args, **kwargs):
+        # Check if this is an HTMX request
+        if request.htmx:
+            # If it is, return just the rides list partial
+            self.template_name = 'rides/partials/ride_list.html'
+        return super().get(request, *args, **kwargs)