diff options
Diffstat (limited to 'mediagoblin/db/models.py')
| -rw-r--r-- | mediagoblin/db/models.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index e0419c92..e4c97a2c 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -496,8 +496,16 @@ class ReportBase(Base): User, backref=backref("reports_filed_by", lazy="dynamic", - cascade="all, delete-orphan")) + cascade="all, delete-orphan"), + primaryjoin="User.id==ReportBase.reporter_id") report_content = Column(UnicodeText) + reported_user_id = Column(Integer, ForeignKey(User.id), nullable=False) + reported_user = relationship( + User, + backref=backref("reports_filed_on", + lazy="dynamic", + cascade="all, delete-orphan"), + primaryjoin="User.id==ReportBase.reported_user_id") created = Column(DateTime, nullable=False, default=datetime.datetime.now()) resolved = Column(DateTime) discriminator = Column('type', Unicode(50)) @@ -590,7 +598,7 @@ class PrivilegeUserAssociation(Base): primary_key=True) -privilege_foundations = [[u'admin'], [u'moderator'], [u'commenter'], [u'uploader'],[u'reporter'],[u'active']] +privilege_foundations = [[u'admin'], [u'moderator'], [u'uploader'],[u'reporter'], [u'commenter'] ,[u'active']] MODELS = [ User, MediaEntry, Tag, MediaTag, MediaComment, Collection, CollectionItem, |