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

Merge branch 'master' into fix-permissions

Browse Source 
Conflicts:
	app/main/views/jobs.py
	tests/app/main/views/test_manage_users.py
This commit is contained in:
Rebecca Law
2016-03-30 10:36:55 +01:00
parent 1cfaeec7b2 1a8d4fda69
commit c99df69025
25 changed files with 132 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main/views/dashboard.py
View File

@@ -7,9 +7,8 @@ from flask import (
from flask_login import login_required
from app.main import main
from app.main.dao.services_dao import get_service_by_id
from app.main.dao import templates_dao
from app import job_api_client, statistics_api_client
from app import (job_api_client, statistics_api_client, service_api_client)
from app.utils import user_has_permissions
@@ -20,7 +19,7 @@ def service_dashboard(service_id):
templates = templates_dao.get_service_templates(service_id)['data']
jobs = job_api_client.get_job(service_id)['data']
service = get_service_by_id(service_id)
service = service_api_client.get_service(service_id)
session['service_name'] = service['data']['name']
session['service_id'] = service['data']['id']