Only show ‘Choose service’ if multiple services

When the user clicks ‘GOV.UK Notify’ in the header, they should, by
default, be redirected to the dashboard for their service. They should
only see the ‘Choose service’ page if they have multiple services.

This also allows some logic to be factored out of the template, so one
route now handles all this redirection.

In the future we might want to keep the last-used service in the
session, and always redirect to that. But for now, this should fix most
of the confusion for first-time users.
This commit is contained in:
Chris Hill-Scott
2016-03-29 10:39:01 +01:00
parent 8a55e61dac
commit eb279c88d4
3 changed files with 61 additions and 9 deletions

View File

@@ -1,13 +1,29 @@
from flask import (render_template, redirect, url_for, session)
from flask_login import login_required, current_user
from app.main.dao import services_dao
from app.main.dao.services_dao import ServicesBrowsableItem
from app import service_api_client
from app.main import main
@main.route("/services")
@login_required
def choose_service():
services = services_dao.get_services(current_user.id)
return render_template(
'views/choose-service.html',
services=[services_dao.ServicesBrowsableItem(x) for x in services['data']])
services=[ServicesBrowsableItem(x) for x in service_api_client.get_services()['data']]
)
@main.route("/services-or-dashboard")
def show_all_services_or_dashboard():
if current_user.is_authenticated():
services = service_api_client.get_services()['data']
if 1 == len(services):
return redirect(url_for('.service_dashboard', service_id=services[0]['id']))
else:
return redirect(url_for('.choose_service'))
return redirect(url_for('main.index'))