same as last commit
parent
c30b430a2a
commit
979d938385
|
@ -81,8 +81,14 @@ def chat(v, chat_id):
|
|||
membership.notification = False
|
||||
g.db.add(membership)
|
||||
g.db.commit() #to clear notif count
|
||||
|
||||
query = g.db.query(ChatMembership).filter_by(chat_id=chat.id)
|
||||
sorted_memberships = [query.filter_by(user_id=chat.owner_id).one_or_none()] + query.filter(ChatMembership.user_id != chat.owner_id).join(ChatMembership.user).order_by(func.lower(User.username)).all()
|
||||
|
||||
sorted_memberships = query.filter(ChatMembership.user_id != chat.owner_id).join(ChatMembership.user).order_by(func.lower(User.username)).all()
|
||||
owner_membership = query.filter_by(user_id=chat.owner_id).one_or_none()
|
||||
if owner_membership:
|
||||
sorted_memberships = [owner_membership] + sorted_memberships
|
||||
|
||||
|
||||
return render_template("chat.html", v=v, messages=displayed_messages, chat=chat, sorted_memberships=sorted_memberships)
|
||||
|
||||
|
|
Loading…
Reference in New Issue