From 85e95294c83b050d482a184f3580d09eeaa44afd Mon Sep 17 00:00:00 2001 From: Cristiano Urban Date: Wed, 20 Oct 2021 15:58:08 +0200 Subject: [PATCH] Limit job listing on screen to 30 entries. Signed-off-by: Cristiano Urban --- transfer_service/db_connector.py | 64 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/transfer_service/db_connector.py b/transfer_service/db_connector.py index ff8bfdc..75b6e29 100644 --- a/transfer_service/db_connector.py +++ b/transfer_service/db_connector.py @@ -395,19 +395,19 @@ class DbConnector(object): creation_time, start_time, owner_id - FROM job - WHERE phase NOT IN ('ABORTED', - 'ARCHIVED', - 'COMPLETED', - 'ERROR') - AND - job_type IN ('pullFromVoSpace', - 'pullToVoSpace', - 'pushToVoSpace', - 'vos_data', - 'vos_group', - 'vos_import') - ORDER BY creation_time DESC; + FROM job + WHERE phase NOT IN ('ABORTED', + 'ARCHIVED', + 'COMPLETED', + 'ERROR') + AND job_type IN ('pullFromVoSpace', + 'pullToVoSpace', + 'pushToVoSpace', + 'vos_data', + 'vos_group', + 'vos_import') + ORDER BY creation_time DESC + LIMIT 30; """) result = cursor.fetchall() cursor.close() @@ -438,16 +438,16 @@ class DbConnector(object): creation_time, start_time, owner_id - FROM job - WHERE phase = %s - AND - job_type IN ('pullFromVoSpace', - 'pullToVoSpace', - 'pushToVoSpace', - 'vos_data', - 'vos_group', - 'vos_import') - ORDER BY creation_time DESC; + FROM job + WHERE phase = %s + AND job_type IN ('pullFromVoSpace', + 'pullToVoSpace', + 'pushToVoSpace', + 'vos_data', + 'vos_group', + 'vos_import') + ORDER BY creation_time DESC + LIMIT 30; """, (phase,)) else: @@ -459,15 +459,15 @@ class DbConnector(object): end_time, owner_id FROM job - WHERE phase = %s - AND - job_type IN ('pullFromVoSpace', - 'pullToVoSpace', - 'pushToVoSpace', - 'vos_data', - 'vos_group', - 'vos_import') - ORDER BY creation_time DESC; + WHERE phase = %s + AND job_type IN ('pullFromVoSpace', + 'pullToVoSpace', + 'pushToVoSpace', + 'vos_data', + 'vos_group', + 'vos_import') + ORDER BY creation_time DESC + LIMIT 30; """, (phase,)) result = cursor.fetchall() -- GitLab