darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-19 05:59:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

add tests for new jobs functionality

Browse Source
This commit is contained in:
Leo Hemsted
2016-10-10 17:15:57 +01:00
parent dbe4400441
commit 0fdd38b9c5
6 changed files with 80 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/main/views/jobs.py
View File

@@ -79,13 +79,12 @@ def view_jobs(service_id):
if job['original_file_name'] != current_app.config['TEST_MESSAGE_FILENAME']
]
prev_page = None
if jobs_response['links'].get('prev', None):
prev_page = generate_previous_dict('main.view_jobs', service_id, page=page - 1)
prev_page = generate_previous_dict('main.view_jobs', service_id, page)
next_page = None
if jobs_response['links'].get('next', None):
next_page = generate_next_dict('main.view_jobs', service_id, page=page + 1)
next_page = generate_next_dict('main.view_jobs', service_id, page)
return render_template(
'views/jobs/jobs.html',
@@ -234,10 +233,10 @@ def get_notifications(service_id, message_type, status_override=None):
}
prev_page = None
if notifications['links'].get('prev', None):
prev_page = generate_previous_dict('main.view_notifications', service_id, page - 1, url_args=url_args)
prev_page = generate_previous_dict('main.view_notifications', service_id, page, url_args=url_args)
next_page = None
if notifications['links'].get('next', None):
next_page = generate_next_dict('main.view_notifications', service_id, page + 1, url_args)
next_page = generate_next_dict('main.view_notifications', service_id, page, url_args)
if request.path.endswith('csv'):
csv_content = generate_notifications_csv(

4
app/utils.py
View File

@@ -119,11 +119,11 @@ def get_page_from_request():
def generate_previous_dict(view, service_id, page, url_args=None):
return generate_previous_next_dict(view, service_id, page, 'Previous page', url_args or {})
return generate_previous_next_dict(view, service_id, page - 1, 'Previous page', url_args or {})
def generate_next_dict(view, service_id, page, url_args=None):
return generate_previous_next_dict(view, service_id, page, 'Next page', url_args or {})
return generate_previous_next_dict(view, service_id, page + 1, 'Next page', url_args or {})
def generate_previous_next_dict(view, service_id, page, title, url_args):