fix location add

This commit is contained in:
pacnpal
2024-11-05 15:11:45 +00:00
parent 491be57ab2
commit 11fccaaf06
7 changed files with 91 additions and 46 deletions

View File

@@ -17,6 +17,7 @@ from moderation.mixins import EditSubmissionMixin, PhotoSubmissionMixin, History
from moderation.models import EditSubmission
from media.models import Photo
from location.models import Location
from reviews.models import Review # Import the Review model
def location_search(request):
@@ -145,7 +146,7 @@ class ParkListView(ListView):
def get(self, request, *args, **kwargs):
# Check if this is an HTMX request
if request.htmx:
if hasattr(request, 'htmx') and getattr(request, 'htmx', False):
# If it is, return just the parks list partial
self.template_name = "parks/partials/park_list.html"
return super().get(request, *args, **kwargs)
@@ -167,7 +168,7 @@ class ParkDetailView(
queryset = self.get_queryset()
slug = self.kwargs.get(self.slug_url_kwarg)
# Try to get by current or historical slug
return self.model.get_by_slug(slug)[0]
return Park.get_by_slug(slug)[0]
def get_queryset(self):
return super().get_queryset().prefetch_related(
@@ -186,6 +187,17 @@ class ParkDetailView(
'-status', # OPERATING will come before others
'name'
)
# Check if the user has reviewed the park
if self.request.user.is_authenticated:
context["has_reviewed"] = Review.objects.filter(
user=self.request.user,
content_type=ContentType.objects.get_for_model(Park),
object_id=self.object.id
).exists()
else:
context["has_reviewed"] = False
return context
def get_redirect_url_pattern(self):
@@ -214,8 +226,7 @@ class ParkCreateView(LoginRequiredMixin, CreateView):
data[field] = str(data[field])
return data
def form_valid(self, form):
# Normalize coordinates before saving
def normalize_coordinates(self, form):
if form.cleaned_data.get("latitude"):
lat = Decimal(str(form.cleaned_data["latitude"]))
form.cleaned_data["latitude"] = lat.quantize(Decimal('0.000001'), rounding=ROUND_DOWN)
@@ -223,6 +234,10 @@ class ParkCreateView(LoginRequiredMixin, CreateView):
lon = Decimal(str(form.cleaned_data["longitude"]))
form.cleaned_data["longitude"] = lon.quantize(Decimal('0.000001'), rounding=ROUND_DOWN)
def form_valid(self, form):
# Normalize coordinates before saving
self.normalize_coordinates(form)
changes = self.prepare_changes_data(form.cleaned_data)
# Create submission record
@@ -236,7 +251,7 @@ class ParkCreateView(LoginRequiredMixin, CreateView):
)
# If user is moderator or above, auto-approve
if self.request.user.role in ["MODERATOR", "ADMIN", "SUPERUSER"]:
if hasattr(self.request.user, 'role') and getattr(self.request.user, 'role', None) in ["MODERATOR", "ADMIN", "SUPERUSER"]:
try:
self.object = form.save()
submission.object_id = self.object.id
@@ -337,8 +352,7 @@ class ParkUpdateView(LoginRequiredMixin, UpdateView):
data[field] = str(data[field])
return data
def form_valid(self, form):
# Normalize coordinates before saving
def normalize_coordinates(self, form):
if form.cleaned_data.get("latitude"):
lat = Decimal(str(form.cleaned_data["latitude"]))
form.cleaned_data["latitude"] = lat.quantize(Decimal('0.000001'), rounding=ROUND_DOWN)
@@ -346,6 +360,10 @@ class ParkUpdateView(LoginRequiredMixin, UpdateView):
lon = Decimal(str(form.cleaned_data["longitude"]))
form.cleaned_data["longitude"] = lon.quantize(Decimal('0.000001'), rounding=ROUND_DOWN)
def form_valid(self, form):
# Normalize coordinates before saving
self.normalize_coordinates(form)
changes = self.prepare_changes_data(form.cleaned_data)
# Create submission record
@@ -360,7 +378,7 @@ class ParkUpdateView(LoginRequiredMixin, UpdateView):
)
# If user is moderator or above, auto-approve
if self.request.user.role in ["MODERATOR", "ADMIN", "SUPERUSER"]:
if hasattr(self.request.user, 'role') and getattr(self.request.user, 'role', None) in ["MODERATOR", "ADMIN", "SUPERUSER"]:
try:
self.object = form.save()
submission.status = "APPROVED"
@@ -464,7 +482,7 @@ class ParkAreaDetailView(
park_slug = self.kwargs.get("park_slug")
area_slug = self.kwargs.get("area_slug")
# Try to get by current or historical slug
obj, is_old_slug = self.model.get_by_slug(area_slug)
obj, is_old_slug = ParkArea.get_by_slug(area_slug)
if obj.park.slug != park_slug:
raise self.model.DoesNotExist("Park slug doesn't match")
return obj