diff --git a/busManager/coord/admin.py b/busManager/coord/admin.py index 1ecf238..463d6d1 100644 --- a/busManager/coord/admin.py +++ b/busManager/coord/admin.py @@ -275,10 +275,8 @@ class TravellerAdmin(MyImportExportModelAdmin, CloneModelAdmin, admin.ModelAdmin return "Multiple" def save_model(self, request, obj, form, change): - print("Saving") if obj.is_archived and obj.travel_end_date is None: obj.is_archived = False - print("Pulling out of archive") super().save_model(request, obj, form, change) diff --git a/busManager/coord/models.py b/busManager/coord/models.py index 7cf82ed..27fdd52 100644 --- a/busManager/coord/models.py +++ b/busManager/coord/models.py @@ -97,12 +97,18 @@ class Bus(models.Model): class Shuttle(models.Model): bus = models.ForeignKey(Bus, on_delete=models.CASCADE) school = models.ForeignKey(School, on_delete=models.CASCADE) + custom_name = models.CharField(max_length=10, blank=True) class Meta: ordering = ["school__name"] def __str__(self): - return f"{self.school.shortName} <-> {self.bus.route_name}" + custom_name = self.custom_name + if custom_name: + custom_name = f" ({self.custom_name})" + else: + custom_name = "" + return f"{self.school.shortName} <-> {self.bus.route_name}{custom_name}" def traveller_count(self): count = 0