Merge branch 'master' of https://github.com/Aevann1/Drama
This commit is contained in:
commit
ce3be3bcb2
15 changed files with 41 additions and 41 deletions
|
@ -251,7 +251,7 @@ class User(Base):
|
|||
@lazy
|
||||
def banned_by(self):
|
||||
if not self.is_suspended: return None
|
||||
return g.db.query(User).filter_by(id=self.is_banned).first()
|
||||
return g.db.query(User).options(lazyload('*')).filter_by(id=self.is_banned).first()
|
||||
|
||||
def has_badge(self, badgedef_id):
|
||||
return self.badges.filter_by(badge_id=badgedef_id).first()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue