From 760ee90b72965ca3788fa8a443a284bccb8a370f Mon Sep 17 00:00:00 2001 From: tdruez Date: Mon, 20 Jan 2025 21:34:53 +0900 Subject: [PATCH] Do not display the select across if single page #1524 Signed-off-by: tdruez --- .../modals/projects_archive_modal.html | 18 ++++++++++-------- .../modals/projects_download_modal.html | 18 ++++++++++-------- .../scanpipe/modals/projects_report_modal.html | 18 ++++++++++-------- scanpipe/views.py | 2 +- 4 files changed, 31 insertions(+), 25 deletions(-) diff --git a/scanpipe/templates/scanpipe/modals/projects_archive_modal.html b/scanpipe/templates/scanpipe/modals/projects_archive_modal.html index 6efc3dcd0..d34f01a2c 100644 --- a/scanpipe/templates/scanpipe/modals/projects_archive_modal.html +++ b/scanpipe/templates/scanpipe/modals/projects_archive_modal.html @@ -33,14 +33,16 @@ {{ archive_form.remove_output.label }} -
-
- -

{{ outputs_download_form.select_across.help_text }}

-
+ {% if page_obj.paginator.num_pages > 1 %} +
+
+ +

{{ outputs_download_form.select_across.help_text }}

+
+ {% endif %} diff --git a/scanpipe/templates/scanpipe/modals/projects_download_modal.html b/scanpipe/templates/scanpipe/modals/projects_download_modal.html index 5c42beb91..1fe68555b 100644 --- a/scanpipe/templates/scanpipe/modals/projects_download_modal.html +++ b/scanpipe/templates/scanpipe/modals/projects_download_modal.html @@ -14,14 +14,16 @@ {{ outputs_download_form.output_format }} -
-
- -

{{ outputs_download_form.select_across.help_text }}

-
+ {% if page_obj.paginator.num_pages > 1 %} +
+
+ +

{{ outputs_download_form.select_across.help_text }}

+
+ {% endif %} diff --git a/scanpipe/templates/scanpipe/modals/projects_report_modal.html b/scanpipe/templates/scanpipe/modals/projects_report_modal.html index 5969ae389..5a25d0586 100644 --- a/scanpipe/templates/scanpipe/modals/projects_report_modal.html +++ b/scanpipe/templates/scanpipe/modals/projects_report_modal.html @@ -14,14 +14,16 @@ {{ report_form.model_name }} -
-
- -

{{ report_form.select_across.help_text }}

-
+ {% if page_obj.paginator.num_pages > 1 %} +
+
+ +

{{ report_form.select_across.help_text }}

+
+ {% endif %} diff --git a/scanpipe/views.py b/scanpipe/views.py index 314f851c7..17f7aaf7b 100644 --- a/scanpipe/views.py +++ b/scanpipe/views.py @@ -556,6 +556,7 @@ class ProjectListView( ): model = Project filterset_class = ProjectFilterSet + paginate_by = settings.SCANCODEIO_PAGINATE_BY.get("project", 20) template_name = "scanpipe/project_list.html" prefetch_related = [ "labels", @@ -572,7 +573,6 @@ class ProjectListView( ), ), ] - paginate_by = settings.SCANCODEIO_PAGINATE_BY.get("project", 20) table_columns = [ "name", {