diff --git a/drama/__main__.py b/drama/__main__.py index 8f1cc2182..f90e7c783 100644 --- a/drama/__main__.py +++ b/drama/__main__.py @@ -175,7 +175,8 @@ def retry(f): return f(self, *args, **kwargs) except OperationalError as e: #self.session.rollback() - raise(DatabaseOverload) + #raise(DatabaseOverload) + abort(500) except: self.session.rollback() return f(self, *args, **kwargs) diff --git a/drama/classes/award.py b/drama/classes/award.py index 231f23c4d..40e93c4bb 100644 --- a/drama/classes/award.py +++ b/drama/classes/award.py @@ -43,3 +43,7 @@ class AwardRelationship(Base): primaryjoin="AwardRelationship.comment_id==Comment.id", lazy="joined" ) + + @property + def type(self): + return AWARDS[self.kind]