From 97c0dffbd35856baeaf55baca3416c29cd873db1 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 31 Dec 2019 16:42:56 +0000 Subject: [PATCH] Order revisions by date created (#389) --- RIGS/versioning.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/RIGS/versioning.py b/RIGS/versioning.py index 102756ab..9dff4a3e 100644 --- a/RIGS/versioning.py +++ b/RIGS/versioning.py @@ -168,13 +168,12 @@ class RIGSVersionManager(VersionQuerySet): for model in model_array: content_types.append(ContentType.objects.get_for_model(model)) - return self.filter(content_type__in=content_types).select_related("revision").order_by("-pk") + return self.filter(content_type__in=content_types).select_related("revision").order_by("-revision__date_created") class RIGSVersion(Version): class Meta: proxy = True - ordering = ['-date_created'] objects = RIGSVersionManager.as_manager() @@ -207,7 +206,7 @@ class VersionHistory(generic.ListView): paginate_by = 25 def get_queryset(self, **kwargs): - return RIGSVersion.objects.get_for_object(self.get_object()).select_related("revision", "revision__user").all() + return RIGSVersion.objects.get_for_object(self.get_object()).select_related("revision", "revision__user").all().order_by("-revision__date_created") def get_object(self, **kwargs): return get_object_or_404(self.kwargs['model'], pk=self.kwargs['pk']) @@ -226,7 +225,7 @@ class ActivityTable(generic.ListView): def get_queryset(self): versions = RIGSVersion.objects.get_for_multiple_models([models.Event, models.Venue, models.Person, models.Organisation, models.EventAuthorisation]) - return versions + return versions.order_by("-revision__date_created") class ActivityFeed(generic.ListView): @@ -236,7 +235,7 @@ class ActivityFeed(generic.ListView): def get_queryset(self): versions = RIGSVersion.objects.get_for_multiple_models([models.Event, models.Venue, models.Person, models.Organisation, models.EventAuthorisation]) - return versions + return versions.order_by("-revision__date_created") def get_context_data(self, **kwargs): # Call the base implementation first to get a context