A platform admin user is able to see a list of all services.

Each service on the list is linked to the dashboard page of the service.
The platform admin user can see/edit templates, see/invite users, see/edit service settings.
The platform admin user can not send messages, see/edit api keys and developer docs.
This commit is contained in:
Rebecca Law
2016-03-17 10:46:47 +00:00
parent cc15d92aaa
commit b28fbc16d7
22 changed files with 154 additions and 104 deletions

View File

@@ -15,7 +15,7 @@ from app.notify_client.models import InvitedUser
from app import (
invite_api_client,
user_api_client,
notifications_api_client)
service_api_client)
@main.route("/add-service", methods=['GET', 'POST'])
@@ -36,7 +36,7 @@ def add_service():
heading = 'Which service do you want to set up notifications for?'
if form.validate_on_submit():
session['service_name'] = form.name.data
service_id = notifications_api_client.create_service(
service_id = service_api_client.create_service(
session['service_name'], False, current_app.config['DEFAULT_SERVICE_LIMIT'], True, session['user_id'])
return redirect(url_for('main.service_dashboard', service_id=service_id))

View File

@@ -0,0 +1,15 @@
from flask import render_template
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
@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']]
return render_template('views/all-services.html', services=services)

View File

@@ -4,7 +4,6 @@ import time
from flask import (
render_template,
abort,
jsonify
)
from flask_login import login_required

View File

@@ -2,7 +2,6 @@ from flask import (
request,
render_template,
redirect,
abort,
url_for,
flash)
@@ -24,7 +23,7 @@ from app.utils import user_has_permissions
@main.route("/services/<service_id>/users")
@login_required
@user_has_permissions('manage_users', 'manage_templates', 'manage_settings')
@user_has_permissions('manage_users', 'manage_templates', 'manage_settings', admin_override=True)
def manage_users(service_id):
users = user_api_client.get_users_for_service(service_id=service_id)
invited_users = invite_api_client.get_invites_for_service(service_id=service_id)
@@ -41,7 +40,7 @@ def manage_users(service_id):
@main.route("/services/<service_id>/users/invite", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_users', 'manage_templates', 'manage_settings')
@user_has_permissions('manage_users', 'manage_templates', 'manage_settings', admin_override=True)
def invite_user(service_id):
service = get_service_by_id(service_id)
@@ -64,7 +63,7 @@ def invite_user(service_id):
@main.route("/services/<service_id>/users/<user_id>", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_users', 'manage_templates', 'manage_settings')
@user_has_permissions('manage_users', 'manage_templates', 'manage_settings', admin_override=True)
def edit_user_permissions(service_id, user_id):
# TODO we should probably using the service id here in the get user
# call as well. eg. /user/<user_id>?&service_id=service_id
@@ -101,7 +100,7 @@ def edit_user_permissions(service_id, user_id):
@main.route("/services/<service_id>/cancel-invited-user/<invited_user_id>", methods=['GET'])
@user_has_permissions('manage_users', 'manage_templates', 'manage_settings')
@user_has_permissions('manage_users', 'manage_templates', 'manage_settings', admin_override=True)
def cancel_invited_user(service_id, invited_user_id):
invite_api_client.cancel_invited_user(service_id=service_id, invited_user_id=invited_user_id)

View File

@@ -66,7 +66,7 @@ def get_page_headings(template_type):
@main.route("/services/<service_id>/send/<template_type>", methods=['GET'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters', 'manage_templates', or_=True)
@user_has_permissions('send_texts', 'send_emails', 'send_letters', 'manage_templates', admin_override=True, or_=True)
def choose_template(service_id, template_type):
service = services_dao.get_service_by_id_or_404(service_id)

View File

@@ -3,7 +3,6 @@ from flask import (
redirect,
request,
url_for,
abort,
session,
flash
)
@@ -29,7 +28,7 @@ from app.main.forms import ConfirmPasswordForm, ServiceNameForm
@main.route("/services/<service_id>/service-settings")
@login_required
@user_has_permissions('manage_settings')
@user_has_permissions('manage_settings', admin_override=True)
def service_settings(service_id):
service = get_service_by_id(service_id)['data']
@@ -42,7 +41,7 @@ def service_settings(service_id):
@main.route("/services/<service_id>/service-settings/name", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings')
@user_has_permissions('manage_settings', admin_override=True)
def service_name_change(service_id):
service = get_service_by_id(service_id)['data']
@@ -61,7 +60,7 @@ def service_name_change(service_id):
@main.route("/services/<service_id>/service-settings/name/confirm", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings')
@user_has_permissions('manage_settings', admin_override=True)
def service_name_change_confirm(service_id):
service = get_service_by_id(service_id)['data']
@@ -95,7 +94,7 @@ def service_name_change_confirm(service_id):
@main.route("/services/<service_id>/service-settings/request-to-go-live", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings')
@user_has_permissions('manage_settings', admin_override=True)
def service_request_to_go_live(service_id):
service = get_service_by_id(service_id)['data']
if request.method == 'GET':
@@ -112,7 +111,7 @@ def service_request_to_go_live(service_id):
@main.route("/services/<service_id>/service-settings/status", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings')
@user_has_permissions('manage_settings', admin_override=True)
def service_status_change(service_id):
service = get_service_by_id(service_id)['data']
@@ -128,7 +127,7 @@ def service_status_change(service_id):
@main.route("/services/<service_id>/service-settings/status/confirm", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings')
@user_has_permissions('manage_settings', admin_override=True)
def service_status_change_confirm(service_id):
service = get_service_by_id(service_id)['data']
@@ -151,7 +150,7 @@ def service_status_change_confirm(service_id):
@main.route("/services/<service_id>/service-settings/delete", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings')
@user_has_permissions('manage_settings', admin_override=True)
def service_delete(service_id):
service = get_service_by_id(service_id)['data']
@@ -167,7 +166,7 @@ def service_delete(service_id):
@main.route("/services/<service_id>/service-settings/delete/confirm", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings')
@user_has_permissions('manage_settings', admin_override=True)
def service_delete_confirm(service_id):
service = get_service_by_id(service_id)['data']

View File

@@ -21,7 +21,7 @@ page_headings = {
@main.route("/services/<service_id>/templates/add-<template_type>", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_templates')
@user_has_permissions('manage_templates', admin_override=True)
def add_service_template(service_id, template_type):
service = sdao.get_service_by_id_or_404(service_id)
@@ -54,7 +54,7 @@ def add_service_template(service_id, template_type):
@main.route("/services/<service_id>/templates/<int:template_id>", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_templates')
@user_has_permissions('manage_templates', admin_override=True)
def edit_service_template(service_id, template_id):
template = tdao.get_service_template_or_404(service_id, template_id)['data']
template['template_content'] = template['content']
@@ -83,7 +83,7 @@ def edit_service_template(service_id, template_id):
@main.route("/services/<service_id>/templates/<int:template_id>/delete", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_templates')
@user_has_permissions('manage_templates', admin_override=True)
def delete_service_template(service_id, template_id):
template = tdao.get_service_template_or_404(service_id, template_id)['data']