From e765e92584f92dc587cf22d6a2159321d5b720a3 Mon Sep 17 00:00:00 2001 From: dkwncho Date: Tue, 10 Dec 2024 22:27:57 -0500 Subject: [PATCH] Remove unnecessary django imports --- backend/ohq/models.py | 15 +++++---------- backend/ohq/permissions.py | 5 +---- backend/ohq/views.py | 2 -- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/backend/ohq/models.py b/backend/ohq/models.py index de507b2f..f4124d50 100644 --- a/backend/ohq/models.py +++ b/backend/ohq/models.py @@ -5,10 +5,6 @@ from email_tools.emails import send_email from phonenumber_field.modelfields import PhoneNumberField from schedule.models import Event, Occurrence -from django.utils.translation import gettext, gettext_lazy as _ -from django.template.defaultfilters import date -from django.conf import settings as django_settings -from django.urls import reverse User = settings.AUTH_USER_MODEL @@ -459,8 +455,8 @@ class Booking(models.Model): occurrence = models.ForeignKey(Occurrence, on_delete=models.CASCADE) user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True, null=True) - start = models.DateTimeField(_("start"), db_index=True, blank=True) - end = models.DateTimeField(_("end"), db_index=True, blank=True) + start = models.DateTimeField(_("start"), db_index=True) + end = models.DateTimeField(_("end"), db_index=True) class Meta: verbose_name = _("booking") @@ -469,7 +465,6 @@ class Meta: index_together = (("start", "end"),) def __str__(self): - return gettext("%(start)s to %(end)s") % { - "start": date(self.start, django_settings.DATE_FORMAT), - "end": date(self.end, django_settings.DATE_FORMAT), - } \ No newline at end of file + start_str = self.start.strftime("%Y-%m-%d %H:%M:%S") + end_str = self.end.strftime("%Y-%m-%d %H:%M:%S") + return f"{start_str} to {end_str}" \ No newline at end of file diff --git a/backend/ohq/permissions.py b/backend/ohq/permissions.py index c42c5806..09d487fa 100644 --- a/backend/ohq/permissions.py +++ b/backend/ohq/permissions.py @@ -534,10 +534,7 @@ def has_object_permission(self, request, view, obj): if field in restricted_student_fields: return False if "user" in updated_fields: - if booking.user is not None: # Doesn’t allow a student to update user if someone already booked the slot - return False - else: - return True + return booking.user is None # Doesn’t allow a student to update user if someone already booked the slot else: return False diff --git a/backend/ohq/views.py b/backend/ohq/views.py index b8a6bc05..a03c52ae 100644 --- a/backend/ohq/views.py +++ b/backend/ohq/views.py @@ -19,8 +19,6 @@ from django.http import HttpResponseBadRequest, JsonResponse from django.utils import timezone from django.utils.crypto import get_random_string -from django.utils.translation import gettext_lazy as _ -from django.conf import settings as django_settings from django_auto_prefetching import prefetch from django_filters.rest_framework import DjangoFilterBackend from drf_excel.mixins import XLSXFileMixin