diff --git a/scanpipe/filters.py b/scanpipe/filters.py index 1f322fb81..60f5f75ea 100644 --- a/scanpipe/filters.py +++ b/scanpipe/filters.py @@ -88,6 +88,9 @@ def verbose_name_plural(cls): class ProjectFilterSet(FilterSetUtilsMixin, django_filters.FilterSet): search = django_filters.CharFilter(field_name="name", lookup_expr="icontains") + sort = django_filters.OrderingFilter( + fields=(("name", "name"), ("created_date", "created_date")), + ) class Meta: model = Project diff --git a/scanpipe/templates/scanpipe/includes/project_list_table.html b/scanpipe/templates/scanpipe/includes/project_list_table.html index a525ff392..231f89fda 100644 --- a/scanpipe/templates/scanpipe/includes/project_list_table.html +++ b/scanpipe/templates/scanpipe/includes/project_list_table.html @@ -15,6 +15,7 @@ {{ project }} + Created {{ project.created_date|naturaltime }} {% if project.package_count %} @@ -65,4 +66,4 @@ {% endfor %} - \ No newline at end of file + diff --git a/scanpipe/templates/scanpipe/project_list.html b/scanpipe/templates/scanpipe/project_list.html index bbbae8802..2a601d375 100644 --- a/scanpipe/templates/scanpipe/project_list.html +++ b/scanpipe/templates/scanpipe/project_list.html @@ -21,7 +21,27 @@ {% endif %} - New Project +
+ + New Project +
{% include 'scanpipe/includes/search_field.html' %} @@ -49,4 +69,4 @@ {% include 'scanpipe/includes/run_modal.html' %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/scanpipe/views.py b/scanpipe/views.py index fc2fed203..c38288b37 100644 --- a/scanpipe/views.py +++ b/scanpipe/views.py @@ -102,7 +102,7 @@ class ProjectListView( filterset_class = ProjectFilterSet template_name = "scanpipe/project_list.html" prefetch_related = ["runs"] - paginate_by = 10 + paginate_by = 20 def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs)