Skip to content

[IN PROGRESS] Merge changes back to main branch #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andriyun wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[IN PROGRESS] Merge changes back to main branch #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44349e8
Removed limitation for status list. Know it would be visible all stat…
andriyun Mar 17, 2021
b05ee72
Changed order on Webscanners view to show recent scanners first
andriyun Mar 17, 2021
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
4 changes: 2 additions & 2 deletions src/os2datascanner/projects/admin/adminapp/views/scanner_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class StatusOverview(RestrictedListView):
model = ScanStatus

def get_queryset(self):
return super().get_queryset().order_by("-pk")[:10]
return super().get_queryset().order_by("-pk")


class ScannerList(RestrictedListView):
Expand All @@ -28,7 +28,7 @@ class ScannerList(RestrictedListView):

def get_queryset(self):
"""Get queryset, don't include non-visible scanners."""
qs = super().get_queryset()
qs = super().get_queryset().order_by('-id')
# Dismiss scans that are not visible
qs = qs.filter(is_visible=True)
return qs
Expand Down