Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

overridden typo fix #449

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions csm_web/scheduler/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -895,11 +895,11 @@ class OverrideAdmin(BasePermissionModelAdmin):
fields = (
"date",
"spacetime",
"overriden_spacetime",
"overridden_spacetime",
)
autocomplete_fields = (
"spacetime",
"overriden_spacetime",
"overridden_spacetime",
)

list_filter = (
Expand All @@ -922,5 +922,5 @@ def get_old_spacetime(self, obj: Override):
def get_new_spacetime(self, obj: Override):
"""Format link to new spacetime object."""
return get_admin_link_for(
obj.overriden_spacetime, "admin:scheduler_spacetime_change"
obj.overridden_spacetime, "admin:scheduler_spacetime_change"
)
4 changes: 2 additions & 2 deletions csm_web/scheduler/factories.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ def date(self):
date = evaluate_faker(
factory.Faker(
"date_between_dates",
date_start=self.overriden_spacetime.section.mentor.course.enrollment_start.date(),
date_end=self.overriden_spacetime.section.mentor.course.valid_until,
date_start=self.overridden_spacetime.section.mentor.course.enrollment_start.date(),
date_end=self.overridden_spacetime.section.mentor.course.valid_until,
)
)
return date + timedelta(
Expand Down
6 changes: 3 additions & 3 deletions csm_web/scheduler/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -528,14 +528,14 @@ class Override(ValidatingModel):
spacetime = models.OneToOneField(
Spacetime, on_delete=models.CASCADE, related_name="+"
)
overriden_spacetime = models.OneToOneField(
overridden_spacetime = models.OneToOneField(
Spacetime, related_name="_override", on_delete=models.CASCADE
)
date = models.DateField()

def clean(self):
super().clean()
if self.spacetime == self.overriden_spacetime:
if self.spacetime == self.overridden_spacetime:
raise ValidationError("A spacetime cannot override itself")
if self.spacetime.day_of_week != self.date.strftime("%A"):
raise ValidationError(
Expand All @@ -548,7 +548,7 @@ def is_expired(self):
return self.date < now.date()

def __str__(self):
return f"Override for {self.overriden_spacetime.section} : {self.spacetime}"
return f"Override for {self.overridden_spacetime.section} : {self.spacetime}"


class Matcher(ValidatingModel):
Expand Down
10 changes: 5 additions & 5 deletions csm_web/scheduler/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -350,11 +350,11 @@ def create(self, validated_data):
spacetime = Spacetime.objects.create(
**validated_data["spacetime"],
day_of_week=DayOfWeekField.DAYS[validated_data["date"].weekday()],
duration=validated_data["overriden_spacetime"].duration,
duration=validated_data["overridden_spacetime"].duration,
)
return Override.objects.create(
date=validated_data["date"],
overriden_spacetime=validated_data["overriden_spacetime"],
overridden_spacetime=validated_data["overridden_spacetime"],
spacetime=spacetime,
)

Expand All @@ -366,15 +366,15 @@ def update(self, instance, validated_data):
]
instance.spacetime.location = spacetime_data["location"]
instance.spacetime.start_time = spacetime_data["start_time"]
instance.spacetime.duration = instance.overriden_spacetime.duration
instance.spacetime.duration = instance.overridden_spacetime.duration
instance.spacetime.save()
instance.save()
return instance

class Meta:
model = Override
fields = ("location", "start_time", "date", "overriden_spacetime")
extra_kwargs = {"overriden_spacetime": {"required": False}}
fields = ("location", "start_time", "date", "overridden_spacetime")
extra_kwargs = {"overridden_spacetime": {"required": False}}


class MatcherSerializer(serializers.ModelSerializer):
Expand Down
2 changes: 1 addition & 1 deletion csm_web/scheduler/views/spacetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def override(self, request, pk=None):
status_code = status.HTTP_202_ACCEPTED
else: # create
serializer = OverrideSerializer(
data={"overriden_spacetime": spacetime.pk, **request.data}
data={"overridden_spacetime": spacetime.pk, **request.data}
)
status_code = status.HTTP_201_CREATED
if serializer.is_valid():
Expand Down
Loading