diff --git a/files/classes/comment.py b/files/classes/comment.py index bd0c945a4..986c83189 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -71,7 +71,7 @@ class Comment(CreatedBase): viewonly=True) reports = relationship("CommentFlag", primaryjoin="CommentFlag.comment_id == Comment.id", - order_by="CommentFlag.created_utc", + order_by="CommentFlag.created_timestampz", viewonly=True) notes = relationship("UserNote", back_populates="comment") diff --git a/files/classes/flags.py b/files/classes/flags.py index 3f71a4c4a..4cfded0e6 100644 --- a/files/classes/flags.py +++ b/files/classes/flags.py @@ -1,9 +1,11 @@ from sqlalchemy import * -from sqlalchemy.orm import relationship -from files.classes.base import CreatedBase +from sqlalchemy.orm import relationship, declarative_base +from files.classes.base import CreatedBase, Base from files.helpers.lazy import lazy from files.helpers.config.const import * + + class Flag(CreatedBase): __tablename__ = "flags" @@ -24,7 +26,7 @@ class Flag(CreatedBase): return self.reason -class CommentFlag(CreatedBase): +class CommentFlag(Base): __tablename__ = "commentflags" id = Column(Integer, primary_key=True)