diff options
Diffstat (limited to 'accounts/views/default/__init__.py')
| -rw-r--r-- | accounts/views/default/__init__.py | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/accounts/views/default/__init__.py b/accounts/views/default/__init__.py index 37f71f6..88105bd 100644 --- a/accounts/views/default/__init__.py +++ b/accounts/views/default/__init__.py @@ -17,11 +17,11 @@ from accounts.models import Account bp = Blueprint('default', __name__) -@bp.route('/', methods=['GET', 'POST']) -@templated('index.html') -def index(): +@bp.route('/login', methods=['GET', 'POST']) +@templated('login.html') +def login(): if current_user.is_authenticated: - return redirect(url_for('.settings')) + return redirect(url_for('.index')) form = LoginForm(request.form) if form.validate_on_submit(): @@ -30,7 +30,7 @@ def index(): form.password.data) login_user(user) flash(u'Erfolgreich eingeloggt', 'success') - return redirect(url_for('.settings')) + return redirect(url_for('.index')) except (current_app.user_backend.NoSuchUserError, current_app.user_backend.InvalidPasswordError): flash(u'Ungültiger Benutzername und/oder Passwort', 'error') @@ -50,7 +50,7 @@ def register(): u'um diese zu überprüfen. Bitte folge den Anweisungen in der ' u'E-Mail.', 'success') - return redirect(url_for('.index')) + return redirect(url_for('.login')) return {'form': form} @@ -69,7 +69,7 @@ def register_complete(token): pass else: flash(u'Du hast den Benutzer bereits angelegt! Du kannst dich jetzt einfach einloggen:') - return redirect(url_for('.index')) + return redirect(url_for('.login')) form = RegisterCompleteForm(request.form) if form.validate_on_submit(): @@ -89,7 +89,7 @@ def register_complete(token): ) flash(u'Benutzer erfolgreich angelegt.', 'success') - return redirect(url_for('.settings')) + return redirect(url_for('.index')) return { 'form': form, @@ -120,7 +120,7 @@ def lost_password(): flash(u'Wir haben dir eine E-Mail mit einem Link zum Passwort ändern ' u'geschickt. Bitte folge den Anweisungen in der E-Mail.', 'success') - return redirect(url_for('.index')) + return redirect(url_for('.login')) return {'form': form} @@ -139,7 +139,7 @@ def lost_password_complete(token): login_user(user) flash(u'Passwort geändert.', 'success') - return redirect(url_for('.settings')) + return redirect(url_for('.index')) return { 'form': form, @@ -148,10 +148,10 @@ def lost_password_complete(token): } -@bp.route('/settings', methods=['GET', 'POST']) -@templated('settings.html') +@bp.route('/', methods=['GET', 'POST']) +@templated('index.html') @login_required -def settings(): +def index(): form = SettingsForm(request.form, mail=current_user.attributes['mail']) if form.validate_on_submit(): changed = False @@ -194,7 +194,7 @@ def settings(): if changed: current_app.user_backend.update(current_user, as_admin=True) #XXX: as_admin wieder wegmachen sobald ACLs richtig gesetzt sind login_user(current_user) - return redirect(url_for('.settings')) + return redirect(url_for('.index')) else: flash(u'Nichts geändert.') @@ -209,7 +209,7 @@ def settings(): } -@bp.route('/settings/change_mail/<token>') +@bp.route('/change_mail/<token>') @login_required def change_mail(token): username, mail = Confirmation('change_mail').loads_http(token, max_age=3*24*60*60) @@ -226,14 +226,14 @@ def change_mail(token): current_app.user_backend.update(current_user) flash(u'E-Mail-Adresse geändert.', 'success') - return redirect(url_for('.settings')) + return redirect(url_for('.index')) @bp.route('/logout') def logout(): logout_user() flash(u'Erfolgreich ausgeloggt.', 'success') - return redirect(url_for('.index')) + return redirect(url_for('.login')) @bp.route('/about') |