From cdb148fc0dcd93cb622867413dc7bb1ff7361750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 15 Jun 2017 11:04:44 +0200 Subject: [PATCH] Just import the forms module, not every single form it it separately. --- pillar/web/users/routes.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pillar/web/users/routes.py b/pillar/web/users/routes.py index b60e7b95..59f4da80 100644 --- a/pillar/web/users/routes.py +++ b/pillar/web/users/routes.py @@ -11,10 +11,9 @@ from werkzeug import exceptions as wz_exceptions import pillar.api.blender_cloud.subscription import pillar.auth from pillar.web import system_util -from .forms import UserProfileForm -from .forms import UserSettingsEmailsForm -from .forms import UserEditForm -from .forms import UserLoginForm + +from . import forms + from pillarsdk import exceptions as sdk_exceptions from pillarsdk.users import User from pillarsdk.groups import Group @@ -82,7 +81,7 @@ def login_local(): """Login with a local account, skipping OAuth. This provides access only to the web application and is meant for limited access (for example in the case of a shared account).""" - form = UserLoginForm() + form = forms.UserLoginForm() # Forward credentials to server if form.validate_on_submit(): payload = { @@ -134,7 +133,7 @@ def settings_profile(): api = system_util.pillar_api() user = User.find(current_user.objectid, api=api) - form = UserProfileForm( + form = forms.UserProfileForm( full_name=user.full_name, username=user.username) @@ -173,7 +172,7 @@ def settings_emails(): user.update(api=api) # Generate form - form = UserSettingsEmailsForm( + form = forms.UserSettingsEmailsForm( email_communications=user.settings.email_communications) if form.validate_on_submit(): @@ -223,7 +222,7 @@ def users_edit(user_id): log.warning('Non-existing user %r requested.', user_id) raise wz_exceptions.NotFound('Non-existing user %r requested.' % user_id) - form = UserEditForm() + form = forms.UserEditForm() if form.validate_on_submit(): _users_edit(form, user, api) else: