Skip to content
Open
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
3 changes: 1 addition & 2 deletions admin/preprints/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ class PreprintSpamList(PermissionRequiredMixin, ListView):
SPAM_STATE = SpamStatus.UNKNOWN

paginate_by = 25
paginate_orphans = 1
ordering = 'created'
permission_required = ('osf.view_spam', 'osf.view_preprint')
raise_exception = True
Expand All @@ -176,7 +175,7 @@ def get_context_data(self, **kwargs):
page_size = self.get_paginate_by(self.object_list)
paginator, page, query_set, is_paginated = self.paginate_queryset(self.object_list, page_size)
return {
'preprints': self.object_list,
'preprints': query_set,
'page': page,
}

Expand Down
1 change: 0 additions & 1 deletion admin/templates/preprints/preprint_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,5 @@
{% if perms.osf.mark_spam %}
{% include 'preprints/spam_modal.html' %}
{% include 'preprints/ham_modal.html' %}
{% include 'preprints/unflag_modal.html' %}
Comment thread
brianjgeiger marked this conversation as resolved.
Resolved
</form>
{% endif %}
25 changes: 25 additions & 0 deletions admin_tests/preprints/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,31 @@ def test_get_known_spam(self, superuser, preprint, ham_preprint, spam_preprint,
assert spam_preprint._id in response_ids
assert preprint._id not in response_ids

@pytest.mark.parametrize('view_class, url_name, spam_status', [
(views.PreprintFlaggedSpamList, 'flagged-spam', SpamStatus.FLAGGED),
(views.PreprintKnownSpamList, 'known-spam', SpamStatus.SPAM),
])
def test_spam_list_pagination(self, superuser, view_class, url_name, spam_status):
preprints = PreprintFactory.create_batch(26, creator=superuser, finish=False, set_doi=False)
preprint_ids = [preprint.id for preprint in preprints]
Preprint.objects.filter(id__in=preprint_ids).update(spam_status=spam_status)

request = RequestFactory().get(reverse(f'preprints:{url_name}'))
request.user = superuser
response = view_class.as_view()(request)

assert response.status_code == 200
assert [res.id for res in response.context_data['preprints']] == preprint_ids[:25]
assert response.context_data['page'].paginator.num_pages == 2

request = RequestFactory().get(reverse(f'preprints:{url_name}'), {'page': 2})
request.user = superuser
response = view_class.as_view()(request)

assert response.status_code == 200
assert [res.id for res in response.context_data['preprints']] == preprint_ids[25:]
assert response.context_data['page'].number == 2

def test_get_known_ham(self, superuser, preprint, ham_preprint, spam_preprint, flagged_preprint):
request = RequestFactory().get(reverse('preprints:known-ham'))
request.user = superuser
Expand Down
Loading