diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index cb73175c5..cb868fde7 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -58,10 +58,9 @@ def service_dashboard(service_id): { "job_id": job["id"], "time_left": get_time_left(job["created_at"]), - # "download_link": url_for(".view_job_csv", service_id=current_service.id, job_id=job["id"]), + "download_link": url_for(".view_job_csv", service_id=current_service.id, job_id=job["id"]), "notification_count": job["notification_count"], "created_by": job["created_by"], - "download_link": url_for(".view_job_csv", service_id=current_service.id, job_id=job["id"]) } for job in job_response.get('data', []) ] @@ -71,7 +70,6 @@ def service_dashboard(service_id): partials=get_dashboard_partials(service_id), notifications=notifications, jobs=jobs, - job_response=job_response['data'], service_data_retention_days=service_data_retention_days, ) diff --git a/app/templates/components/table.html b/app/templates/components/table.html index 2e59e4a33..803030e54 100644 --- a/app/templates/components/table.html +++ b/app/templates/components/table.html @@ -6,7 +6,7 @@ {% for field_heading in field_headings %} - + {% if field_headings_visible %} {{ field_heading }} {% else %} diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html index 4892f1588..f4af4d930 100644 --- a/app/templates/views/dashboard/dashboard.html +++ b/app/templates/views/dashboard/dashboard.html @@ -57,13 +57,9 @@ {% for notification in notifications %} {% if notification %} - + - {% if notification.job.original_file_name %} - {{ notification.job.original_file_name }} - {% else %} - {{ 'Manually entered number' }} - {% endif %} + {{ notification.job.original_file_name if notification.job.original_file_name else 'Manually entered number'}}
View Batch