From ca8462b2f1e9bdcc74054e90c98e58519c7c5e04 Mon Sep 17 00:00:00 2001 From: topilski Date: Mon, 10 Jun 2019 08:04:34 -0400 Subject: [PATCH] Review --- app/subscriber/forms.py | 2 +- app/subscriber/subscriber_entry.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/subscriber/forms.py b/app/subscriber/forms.py index 3c7ee3d..af69ab3 100644 --- a/app/subscriber/forms.py +++ b/app/subscriber/forms.py @@ -11,7 +11,7 @@ class SubscriberForm(FlaskForm): AVAILABLE_COUNTRIES = [('UK', 'United kingdom'), ('RU', 'Russian'), ('BY', 'Belarus')] email = StringField(lazy_gettext(u'Email:'), validators=[InputRequired(), Email(message=lazy_gettext(u'Invalid email')), Length(max=30)]) - password = PasswordField(lazy_gettext(u'Password:'), validators=[InputRequired(), Length(min=6, max=80)]) + password = PasswordField(lazy_gettext(u'Password:'), validators=[InputRequired(), Length(min=4, max=80)]) country = SelectField(lazy_gettext(u'Locale:'), coerce=str, validators=[InputRequired()], choices=AVAILABLE_COUNTRIES) apply = SubmitField(lazy_gettext(u'Apply')) diff --git a/app/subscriber/subscriber_entry.py b/app/subscriber/subscriber_entry.py index ed9155a..f331830 100644 --- a/app/subscriber/subscriber_entry.py +++ b/app/subscriber/subscriber_entry.py @@ -4,7 +4,7 @@ from bson.objectid import ObjectId from enum import IntEnum from mongoengine import Document, EmbeddedDocument, StringField, DateTimeField, IntField, ListField, ReferenceField, \ - PULL, ObjectIdField + PULL, ObjectIdField, EmbeddedDocumentField from app.service.service_entry import ServiceSettings @@ -50,7 +50,7 @@ class Subscriber(Document): type = IntField(default=Type.USER) country = StringField(min_length=2, max_length=3, required=True) servers = ListField(ReferenceField(ServiceSettings, reverse_delete_rule=PULL), default=[]) - devices = ListField(Device(), default=[]) + devices = ListField(EmbeddedDocumentField(Device), default=[]) streams = ListField(ObjectIdField(), default=[]) def add_server(self, server: ServiceSettings):