diff --git a/files/classes/exiles.py b/files/classes/exiles.py index d34b459991..9e3274946a 100644 --- a/files/classes/exiles.py +++ b/files/classes/exiles.py @@ -9,5 +9,7 @@ class Exile(Base): sub = Column(String, ForeignKey("subs.name"), primary_key=True) exiler_id = Column(Integer, ForeignKey("users.id")) + exiler = relationship("User", primaryjoin="User.id==Exile.exiler_id", viewonly=True) + def __repr__(self): return f"" \ No newline at end of file diff --git a/files/routes/subs.py b/files/routes/subs.py index b69fcd8ab2..2b373355da 100644 --- a/files/routes/subs.py +++ b/files/routes/subs.py @@ -173,7 +173,7 @@ def exilees(v, sub): sub = g.db.query(Sub).filter_by(name=sub.strip().lower()).one_or_none() if not sub: abort(404) - users = g.db.query(User).join(Exile, Exile.user_id==User.id).filter_by(sub=sub.name).all() + users = g.db.query(User, Exile).join(Exile, Exile.user_id==User.id).filter_by(sub=sub.name).all() return render_template("sub/exilees.html", v=v, sub=sub, users=users) diff --git a/files/templates/sub/exilees.html b/files/templates/sub/exilees.html index 5d7ace83b0..7cde05a1ba 100644 --- a/files/templates/sub/exilees.html +++ b/files/templates/sub/exilees.html @@ -8,12 +8,15 @@ # Name + Exiled by -{% for user in users %} +{% for user, exile in users %} + {% set exiler=exile.exiler %} {{loop.index}} @{{user.username}}'s profile picture{{user.username}} + @{{exiler.username}}'s profile picture{{exiler.username}} {% endfor %}