diff --git a/multigranja/apps/entities/views/list/base.py b/multigranja/apps/entities/views/list/base.py index 8f8ce2d..0cba017 100644 --- a/multigranja/apps/entities/views/list/base.py +++ b/multigranja/apps/entities/views/list/base.py @@ -1,6 +1,7 @@ from django.views.generic import ListView from django.db.models import Q from entities.models.farm import Farm +from django.shortcuts import redirect class BaseListView(ListView): template_name = "entity_list.html" @@ -21,8 +22,12 @@ class BaseListView(ListView): # Acts like a init function - provides the select_farm Farm object to all dependent views def dispatch(self, request, *args, **kwargs): - farm_id = self.request.session.get('selected_farm_id') - self.selected_farm = Farm.objects.filter(id=farm_id).first() + try: # Prevents Django from loading the page without a selected farm + farm_id = request.session['selected_farm_id'] + except KeyError: + return redirect('entities:user:farm_select') + + self.selected_farm = Farm.objects.filter(id=farm_id, users=request.user).first() return super().dispatch(request, *args, **kwargs) # Filter