Merge with master and test fix.

This commit is contained in:
Nicholas Staples
2016-01-06 17:17:02 +00:00
parent 0a4ea6ca2e
commit 10c2978f85
4 changed files with 6 additions and 6 deletions

View File

@@ -33,7 +33,7 @@ def create_app(config_name):
init_csrf(application)
login_manager.init_app(application)
login_manager.login_view = 'main.render_sign_in'
login_manager.login_view = 'main.sign_in'
from app.main import main as main_blueprint
application.register_blueprint(main_blueprint)

View File

@@ -1,6 +1,6 @@
from flask import (render_template, redirect, url_for)
from flask import session
from flask_login import login_required, logout_user
from flask_login import (login_required, logout_user)
from app.main import main
@@ -9,4 +9,4 @@ from app.main import main
@login_required
def sign_out():
logout_user()
return redirect(url_for('main.render_sign_in'))
return redirect(url_for('main.sign_in'))