From ddb5848d3213cf3d09a0da1aab67d867ef1f7bc2 Mon Sep 17 00:00:00 2001 From: Joel Bradshaw Date: Sat, 16 Jan 2021 23:31:47 -0800 Subject: [PATCH] Move error down into to_ordered_queryset --- bookwyrm/models/base_model.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py index 1253e7a55..3f1ed66d8 100644 --- a/bookwyrm/models/base_model.py +++ b/bookwyrm/models/base_model.py @@ -225,6 +225,9 @@ class OrderedCollectionPageMixin(ActivitypubMixin): def to_ordered_collection(self, queryset, \ remote_id=None, page=False, **kwargs): ''' an ordered collection of whatevers ''' + if not queryset.ordered: + raise RuntimeError('queryset must be ordered') + remote_id = remote_id or self.remote_id if page: return to_ordered_collection_page( @@ -281,6 +284,4 @@ class OrderedCollectionMixin(OrderedCollectionPageMixin): def to_activity(self, **kwargs): ''' an ordered collection of the specified model queryset ''' - if not self.collection_queryset.ordered: - raise RuntimeError('collection_queryset must be ordered') return self.to_ordered_collection(self.collection_queryset, **kwargs)