fix tests when we can't get current object from request

Author: oliche

alyx/actions/admin.py

@@ -348,9 +348,12 @@ class Meta:
 class WaterRestrictionAdmin(BaseActionAdmin):
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         if db_field.name == 'subject':
-            object_id = request.resolver_match.kwargs.get('object_id')
-            obj = self.get_object(request, object_id) if object_id else None
+            obj = None
             kwargs['queryset'] = Subject.objects.filter(cull__isnull=True).order_by('nickname')
+            # here if the form is of an existing water restriction, get the subject
+            if request.resolver_match is not None:
+                object_id = request.resolver_match.kwargs.get('object_id')
+                obj = self.get_object(request, object_id) if object_id else None
             if obj is not None:
                 kwargs['queryset'] = (kwargs['queryset'] | Subject.objects.filter(pk=obj.subject.pk)).order_by('nickname')
                 kwargs['initial'] = obj.subject

deploy/docker-compose-postgres-gunicorn.yaml

@@ -4,7 +4,7 @@ services:
     container_name: alyx_apache
     ports:
       - "8000:8000"
-    env_file: ../alyx/alyx/.env_local
+    env_file: ../alyx/alyx/.env
     command: >
       bash -c "python /var/www/alyx/alyx/manage.py collectstatic --noinput &&
                gunicorn --workers 2 -b 0.0.0.0:8000 alyx.gunicorn_wsgi:application"
@@ -19,7 +19,7 @@ services:
   postgres:
     image: postgres:17
     container_name: alyx_postgres
-    env_file: ../alyx/alyx/.env_local
+    env_file: ../alyx/alyx/.env
     volumes:
       - alyx_postgres:/var/lib/postgresql/data
     expose:

deploy/docker-compose-postgres.yaml

@@ -2,7 +2,7 @@ services:
   postgres:
     image: postgres:17
     container_name: alyx_postgres
-    env_file: ../alyx/alyx/.env
+    env_file: ../alyx/alyx/.env_prod
     volumes:
       - alyx_postgres:/var/lib/postgresql/data
     ports: