Skip to content

Commit e765e92

Browse files
committed
Remove unnecessary django imports
1 parent c67ed2b commit e765e92

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

backend/ohq/models.py

+5-10
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
from email_tools.emails import send_email
66
from phonenumber_field.modelfields import PhoneNumberField
77
from schedule.models import Event, Occurrence
8-
from django.utils.translation import gettext, gettext_lazy as _
9-
from django.template.defaultfilters import date
10-
from django.conf import settings as django_settings
11-
from django.urls import reverse
128

139
User = settings.AUTH_USER_MODEL
1410

@@ -459,8 +455,8 @@ class Booking(models.Model):
459455

460456
occurrence = models.ForeignKey(Occurrence, on_delete=models.CASCADE)
461457
user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True, null=True)
462-
start = models.DateTimeField(_("start"), db_index=True, blank=True)
463-
end = models.DateTimeField(_("end"), db_index=True, blank=True)
458+
start = models.DateTimeField(_("start"), db_index=True)
459+
end = models.DateTimeField(_("end"), db_index=True)
464460

465461
class Meta:
466462
verbose_name = _("booking")
@@ -469,7 +465,6 @@ class Meta:
469465
index_together = (("start", "end"),)
470466

471467
def __str__(self):
472-
return gettext("%(start)s to %(end)s") % {
473-
"start": date(self.start, django_settings.DATE_FORMAT),
474-
"end": date(self.end, django_settings.DATE_FORMAT),
475-
}
468+
start_str = self.start.strftime("%Y-%m-%d %H:%M:%S")
469+
end_str = self.end.strftime("%Y-%m-%d %H:%M:%S")
470+
return f"{start_str} to {end_str}"

backend/ohq/permissions.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -534,10 +534,7 @@ def has_object_permission(self, request, view, obj):
534534
if field in restricted_student_fields:
535535
return False
536536
if "user" in updated_fields:
537-
if booking.user is not None: # Doesn’t allow a student to update user if someone already booked the slot
538-
return False
539-
else:
540-
return True
537+
return booking.user is None # Doesn’t allow a student to update user if someone already booked the slot
541538
else:
542539
return False
543540

backend/ohq/views.py

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
from django.http import HttpResponseBadRequest, JsonResponse
2020
from django.utils import timezone
2121
from django.utils.crypto import get_random_string
22-
from django.utils.translation import gettext_lazy as _
23-
from django.conf import settings as django_settings
2422
from django_auto_prefetching import prefetch
2523
from django_filters.rest_framework import DjangoFilterBackend
2624
from drf_excel.mixins import XLSXFileMixin

0 commit comments

Comments
 (0)