diff --git a/forms/login.py b/forms/login.py
index 2ecd8b9..f98dc3b 100644
--- a/forms/login.py
+++ b/forms/login.py
@@ -1,10 +1,10 @@
from flask_wtf import FlaskForm
-from wtforms import EmailField, PasswordField, BooleanField, SubmitField
+from wtforms import StringField, PasswordField, BooleanField, SubmitField
from wtforms.validators import DataRequired
class LoginForm(FlaskForm):
- login = EmailField('Почта', validators=[DataRequired()])
+ login = StringField('Почта', validators=[DataRequired()])
password = PasswordField('Пароль', validators=[DataRequired()])
remember_me = BooleanField('Запомнить меня')
submit = SubmitField('Войти')
\ No newline at end of file
diff --git a/main.py b/main.py
index b399594..43067ab 100644
--- a/main.py
+++ b/main.py
@@ -97,8 +97,11 @@ def login():
danger = request.args.get('danger') if request.args.get('danger') else False
form = LoginForm()
if form.validate_on_submit():
- db_sess = db_session.create_session()
- user = db_sess.query(User).filter(User.email == form.login.data).first()
+ data_session = db_session.create_session()
+ user = data_session.query(User).filter(User.email == form.login.data).first()
+ if not user:
+ user = data_session.query(User).filter(User.login == form.login.data).first()
+ data_session.close()
if user and user.check_password(form.password.data):
if user.activated:
login_user(user, remember=form.remember_me.data)
diff --git a/templates/main.html b/templates/main.html
index 72e3f88..1a922ce 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -13,9 +13,9 @@