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

@@ -1,8 +1,8 @@
from flask import (render_template, redirect, url_for, session)
from flask_login import login_required, current_user
from app.main.dao.services_dao import ServicesBrowsableItem
from app import service_api_client
from app.main import main
from app import service_api_client
from app.notify_client.api_client import ServicesBrowsableItem
@main.route("/services")
@@ -15,15 +15,11 @@ def choose_service():
@main.route("/services-or-dashboard")
@login_required
def show_all_services_or_dashboard():
services = service_api_client.get_services()['data']
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'))
if 1 == len(services):
return redirect(url_for('.service_dashboard', service_id=services[0]['id']))
else:
return redirect(url_for('.choose_service'))