diff --git a/RIGS/models.py b/RIGS/models.py index 4d307bf2..a84093a1 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -638,7 +638,7 @@ class Invoice(models.Model, RevisionMixin): @property def activity_feed_string(self): - return f"#{self.display_id} for Event {self.event.display_id}" + return f"{self.display_id} for Event {self.event.display_id}" def __str__(self): return f"{self.display_id}: {self.event} (£{self.balance:.2f})" diff --git a/training/views.py b/training/views.py index a73e2b68..7c50bcb5 100644 --- a/training/views.py +++ b/training/views.py @@ -57,7 +57,7 @@ class TraineeItemDetail(generic.ListView): # not an integer pass - return models.Trainee.objects.get(pk=self.kwargs['pk']).qualifications_obtained.all().filter(filter).order_by('-date').select_related('item', 'trainee', 'supervisor', 'item__category') + return models.Trainee.objects.get(pk=self.kwargs['pk']).qualifications_obtained.all().filter(filter).order_by('-item__display_id').select_related('item', 'trainee', 'supervisor', 'item__category') def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs)