diff --git a/funnel/models/comment.py b/funnel/models/comment.py index d2cb6afbc..f38dacca4 100644 --- a/funnel/models/comment.py +++ b/funnel/models/comment.py @@ -220,7 +220,9 @@ class Comment(UuidMixin, BaseMixin, db.Model): 'Comment', backref=sa.orm.backref('in_reply_to', remote_side='Comment.id') ) - _message = MarkdownColumnNative('message', profile='basic', nullable=False) + _message = MarkdownColumnNative( # type: ignore[has-type] + 'message', profile='basic', nullable=False + ) _state = sa.Column( 'state', diff --git a/funnel/models/venue.py b/funnel/models/venue.py index 45f33abfa..a50abd58f 100644 --- a/funnel/models/venue.py +++ b/funnel/models/venue.py @@ -6,7 +6,14 @@ from coaster.sqlalchemy import add_primary_relationship, with_roles -from . import BaseScopedNameMixin, CoordinatesMixin, MarkdownColumn, UuidMixin, db, sa +from . import ( + BaseScopedNameMixin, + CoordinatesMixin, + MarkdownColumnNative, + UuidMixin, + db, + sa, +) from .helpers import reopen from .project import Project from .project_membership import project_child_role_map @@ -25,7 +32,9 @@ class Venue(UuidMixin, BaseScopedNameMixin, CoordinatesMixin, db.Model): grants_via={None: project_child_role_map}, ) parent = sa.orm.synonym('project') - description = MarkdownColumn('description', default='', nullable=False) + description = MarkdownColumnNative( + 'description', profile='basic', default='', nullable=False + ) address1 = sa.Column(sa.Unicode(160), default='', nullable=False) address2 = sa.Column(sa.Unicode(160), default='', nullable=False) city = sa.Column(sa.Unicode(30), default='', nullable=False) @@ -104,7 +113,9 @@ class VenueRoom(UuidMixin, BaseScopedNameMixin, db.Model): grants_via={None: set(project_child_role_map.values())}, ) parent = sa.orm.synonym('venue') - description = MarkdownColumn('description', default='', nullable=False) + description = MarkdownColumnNative( # type: ignore[has-type] + 'description', profile='basic', default='', nullable=False + ) bgcolor = sa.Column(sa.Unicode(6), nullable=False, default='229922') seq = sa.Column(sa.Integer, nullable=False)