diff --git a/history_tracking/views.py b/history_tracking/views.py index c6bb27a6..5fe45989 100644 --- a/history_tracking/views.py +++ b/history_tracking/views.py @@ -5,6 +5,7 @@ from django.template.loader import render_to_string from django.contrib.auth.mixins import LoginRequiredMixin from django.core.exceptions import ValidationError from django.db import transaction +from django.utils import timezone from .models import VersionBranch, VersionTag, ChangeSet from .managers import BranchManager, ChangeTracker, MergeStrategy diff --git a/parks/models.py b/parks/models.py index d15fffc1..a50e144d 100644 --- a/parks/models.py +++ b/parks/models.py @@ -7,6 +7,7 @@ from decimal import Decimal, ROUND_DOWN, InvalidOperation from typing import Tuple, Optional, Any, TYPE_CHECKING from companies.models import Company +from history_tracking.signals import get_current_branch from media.models import Photo from history_tracking.models import HistoricalModel from location.models import Location diff --git a/parks/templates/parks/park_detail.html b/parks/templates/parks/park_detail.html index fbcfee01..cc422b40 100644 --- a/parks/templates/parks/park_detail.html +++ b/parks/templates/parks/park_detail.html @@ -168,7 +168,7 @@ {% for photo in park.photos.all|slice:":4" %}