From 01b5fa93ad045092652da9ee3e32b67cc410b2cb Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Oct 08 2014 12:44:50 +0000 Subject: Adjust the auth_login method to behave according of the auth method choose --- diff --git a/progit/__init__.py b/progit/__init__.py index d0caf9a..43b0f3f 100644 --- a/progit/__init__.py +++ b/progit/__init__.py @@ -32,6 +32,7 @@ from sqlalchemy.exc import SQLAlchemyError import progit.lib import progit.mail_logging import progit.doc_utils +import progit.login_forms # Create the application. @@ -374,7 +375,15 @@ def auth_login(): else: # pragma: no cover admins = set(admins) - return FAS.login(return_url=return_point, groups=admins) + if APP.config.get('PROGIT_AUTH', None) == 'fas': + return FAS.login(return_url=return_point, groups=admins) + elif APP.config.get('PROGIT_AUTH', None) == 'local': + form = progit.login_forms.LoginForm() + return flask.render_template( + 'login/login.html', + next_url=return_point, + form=form, + ) @APP.route('/logout/')