Merge with master.

This commit is contained in:
Nicholas Staples
2016-03-29 22:50:40 +01:00
parent 3e16fc1962
commit 644336b151
16 changed files with 91 additions and 162 deletions

View File

@@ -3,13 +3,13 @@ from flask_login import login_required
from app import service_api_client
from app.main import main
from app.main.dao import services_dao
from app.utils import user_has_permissions
from app.notify_client.api_client import ServicesBrowsableItem
@main.route("/all-services")
@login_required
@user_has_permissions(None, admin_override=True)
def show_all_services():
services = [services_dao.ServicesBrowsableItem(x) for x in service_api_client.get_services()['data']]
services = [ServicesBrowsableItem(x) for x in service_api_client.get_services()['data']]
return render_template('views/all-services.html', services=services)