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

Merge pull request #2192 from alphagov/jobs-one-off

Browse Source 
Show uploaded files in basic view
This commit is contained in:
Chris Hill-Scott
2018-08-02 15:23:58 +01:00
committed by GitHub
parent 505c8b1224 c551ce9a42
commit fc5f3ee132
15 changed files with 205 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,7 @@ from app.utils import (
@main.route("/services/<service_id>/jobs")
@login_required
@user_has_permissions('view_activity')
@user_has_permissions('view_activity', 'send_messages')
def view_jobs(service_id):
page = int(request.args.get('page', 1))
jobs_response = job_api_client.get_page_of_jobs(service_id, page=page)
@@ -54,18 +54,27 @@ def view_jobs(service_id):
if jobs_response['links'].get('next', None):
next_page = generate_next_dict('main.view_jobs', service_id, page)
scheduled_jobs = ''
if not current_user.has_permissions('view_activity') and page == 1:
scheduled_jobs = render_template(
'views/dashboard/_upcoming.html',
scheduled_jobs=job_api_client.get_scheduled_jobs(service_id),
hide_heading=True,
)
return render_template(
'views/jobs/jobs.html',
jobs=jobs,
page=page,
prev_page=prev_page,
next_page=next_page,
scheduled_jobs=scheduled_jobs,
)
@main.route("/services/<service_id>/jobs/<job_id>")
@login_required
@user_has_permissions('view_activity')
@user_has_permissions('view_activity', 'send_messages')
def view_job(service_id, job_id):
job = job_api_client.get_job(service_id, job_id)['data']
if job['job_status'] == 'cancelled':
@@ -147,7 +156,7 @@ def cancel_job(service_id, job_id):
@main.route("/services/<service_id>/jobs/<job_id>.json")
@user_has_permissions('view_activity')
@user_has_permissions('view_activity', 'send_messages')
def view_job_updates(service_id, job_id):
job = job_api_client.get_job(service_id, job_id)['data']