diff --git a/app/blueprints/packages/reviews.py b/app/blueprints/packages/reviews.py index a5b194c7..10edf644 100644 --- a/app/blueprints/packages/reviews.py +++ b/app/blueprints/packages/reviews.py @@ -145,6 +145,7 @@ def delete_review(package, reviewer): reply.thread = thread reply.author = current_user reply.comment = "_converted review into a thread_" + reply.is_status_update = True db.session.add(reply) thread.review = None diff --git a/app/models/threads.py b/app/models/threads.py index 58f5ade4..a344aefc 100644 --- a/app/models/threads.py +++ b/app/models/threads.py @@ -136,6 +136,8 @@ class ThreadReply(db.Model): author_id = db.Column(db.Integer, db.ForeignKey("user.id"), nullable=False) author = db.relationship("User", back_populates="replies", foreign_keys=[author_id]) + is_status_update = db.Column(db.Boolean, server_default="0", nullable=False) + created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow) def get_url(self): diff --git a/app/scss/comments.scss b/app/scss/comments.scss index af72bf9e..5e8d5ab9 100644 --- a/app/scss/comments.scss +++ b/app/scss/comments.scss @@ -32,4 +32,8 @@ height: 60px; object-fit: cover; } + + .status-update p { + margin: 0; + } } diff --git a/app/templates/base.html b/app/templates/base.html index 8c6eb411..7a3c5b8a 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -6,7 +6,7 @@
+ {% for r in thread.replies %} + {% if r.is_status_update %} + {{ render_status_update(r, thread, current_user) }} + {% else %} + {{ render_reply(r, thread, current_user) }} + {% endif %} {% endfor %}
@@ -115,8 +149,7 @@ {% elif form %} - -{% from "macros/forms.html" import render_field, render_submit_field %} + {% from "macros/forms.html" import render_field, render_submit_field %}