|
@@ -36,7 +36,7 @@ def selectable_categories():
|
|
|
|
|
|
|
|
|
def select_primary_group():
|
|
|
- return Group.query.filter(Group.guest == False).order_by(Group.id)
|
|
|
+ return Group.query.filter(not Group.guest).order_by(Group.id)
|
|
|
|
|
|
|
|
|
class UserForm(Form):
|
|
@@ -91,9 +91,10 @@ class UserForm(Form):
|
|
|
def validate_username(self, field):
|
|
|
if hasattr(self, "user"):
|
|
|
user = User.query.filter(
|
|
|
- db.and_(User.username.like(field.data),
|
|
|
- db.not_(User.id == self.user.id)
|
|
|
- )
|
|
|
+ db.and_(
|
|
|
+ User.username.like(field.data),
|
|
|
+ db.not_(User.id == self.user.id)
|
|
|
+ )
|
|
|
).first()
|
|
|
else:
|
|
|
user = User.query.filter(User.username.like(field.data)).first()
|
|
@@ -104,9 +105,10 @@ class UserForm(Form):
|
|
|
def validate_email(self, field):
|
|
|
if hasattr(self, "user"):
|
|
|
user = User.query.filter(
|
|
|
- db.and_(User.email.like(field.data),
|
|
|
- db.not_(User.id == self.user.id)
|
|
|
- )
|
|
|
+ db.and_(
|
|
|
+ User.email.like(field.data),
|
|
|
+ db.not_(User.id == self.user.id)
|
|
|
+ )
|
|
|
).first()
|
|
|
else:
|
|
|
user = User.query.filter(User.email.like(field.data)).first()
|
|
@@ -194,9 +196,10 @@ class GroupForm(Form):
|
|
|
def validate_name(self, field):
|
|
|
if hasattr(self, "group"):
|
|
|
group = Group.query.filter(
|
|
|
- db.and_(Group.name.like(field.data),
|
|
|
- db.not_(Group.id == self.group.id)
|
|
|
- )
|
|
|
+ db.and_(
|
|
|
+ Group.name.like(field.data),
|
|
|
+ db.not_(Group.id == self.group.id)
|
|
|
+ )
|
|
|
).first()
|
|
|
else:
|
|
|
group = Group.query.filter(Group.name.like(field.data)).first()
|
|
@@ -207,9 +210,10 @@ class GroupForm(Form):
|
|
|
def validate_banned(self, field):
|
|
|
if hasattr(self, "group"):
|
|
|
group = Group.query.filter(
|
|
|
- db.and_(Group.banned == True,
|
|
|
- db.not_(Group.id == self.group.id)
|
|
|
- )
|
|
|
+ db.and_(
|
|
|
+ Group.banned,
|
|
|
+ db.not_(Group.id == self.group.id)
|
|
|
+ )
|
|
|
).count()
|
|
|
else:
|
|
|
group = Group.query.filter_by(banned=True).count()
|
|
@@ -220,9 +224,10 @@ class GroupForm(Form):
|
|
|
def validate_guest(self, field):
|
|
|
if hasattr(self, "group"):
|
|
|
group = Group.query.filter(
|
|
|
- db.and_(Group.guest == True,
|
|
|
- db.not_(Group.id == self.group.id)
|
|
|
- )
|
|
|
+ db.and_(
|
|
|
+ Group.guest,
|
|
|
+ db.not_(Group.id == self.group.id)
|
|
|
+ )
|
|
|
).count()
|
|
|
else:
|
|
|
group = Group.query.filter_by(guest=True).count()
|
|
@@ -250,12 +255,17 @@ class ForumForm(Form):
|
|
|
title = TextField("Forum Title", validators=[
|
|
|
Required(message="Forum title required")])
|
|
|
|
|
|
- description = TextAreaField("Description", validators=[
|
|
|
- Optional()],
|
|
|
- description="You can format your description with BBCode.")
|
|
|
+ description = TextAreaField(
|
|
|
+ "Description",
|
|
|
+ validators=[Optional()],
|
|
|
+ description="You can format your description with BBCode."
|
|
|
+ )
|
|
|
|
|
|
- position = IntegerField("Position", default=1, validators=[
|
|
|
- Required(message="Forum position required")])
|
|
|
+ position = IntegerField(
|
|
|
+ "Position",
|
|
|
+ default=1,
|
|
|
+ validators=[Required(message="Forum position required")]
|
|
|
+ )
|
|
|
|
|
|
category = QuerySelectField(
|
|
|
"Category",
|
|
@@ -265,9 +275,11 @@ class ForumForm(Form):
|
|
|
description="The category that contains this forum."
|
|
|
)
|
|
|
|
|
|
- external = TextField("External link", validators=[
|
|
|
- Optional(), URL()],
|
|
|
- description="A link to a website i.e. 'http://flaskbb.org'")
|
|
|
+ external = TextField(
|
|
|
+ "External link",
|
|
|
+ validators=[Optional(), URL()],
|
|
|
+ description="A link to a website i.e. 'http://flaskbb.org'"
|
|
|
+ )
|
|
|
|
|
|
moderators = TextField(
|
|
|
"Moderators",
|
|
@@ -355,12 +367,17 @@ class CategoryForm(Form):
|
|
|
title = TextField("Category title", validators=[
|
|
|
Required(message="Category title required")])
|
|
|
|
|
|
- description = TextAreaField("Description", validators=[
|
|
|
- Optional()],
|
|
|
- description="You can format your description with BBCode.")
|
|
|
+ description = TextAreaField(
|
|
|
+ "Description",
|
|
|
+ validators=[Optional()],
|
|
|
+ description="You can format your description with BBCode."
|
|
|
+ )
|
|
|
|
|
|
- position = IntegerField("Position", default=1, validators=[
|
|
|
- Required(message="Category position required")])
|
|
|
+ position = IntegerField(
|
|
|
+ "Position",
|
|
|
+ default=1,
|
|
|
+ validators=[Required(message="Category position required")]
|
|
|
+ )
|
|
|
|
|
|
def save(self):
|
|
|
category = Category(**self.data)
|