3 files changed, 73 insertions, 12 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index 3e6791c4..247298ac 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -299,8 +299,6 @@ class ReportBase_v0(declarative_base()):
     report_content = Column(UnicodeText)
     reported_user_id = Column(Integer, ForeignKey(User.id), nullable=False)
     created = Column(DateTime, nullable=False, default=datetime.datetime.now) 
-    resolved = Column(DateTime)
-    result = Column(UnicodeText)
     discriminator = Column('type', Unicode(50))
     __mapper_args__ = {'polymorphic_on': discriminator}
 
@@ -317,13 +315,20 @@ class MediaReport_v0(ReportBase_v0):
     __tablename__ = 'core__reports_on_media'
     __mapper_args__ = {'polymorphic_identity': 'media_report'}
 
-    id = Column(
-        'id',
-        Integer, 
-        ForeignKey('core__reports.id'),
-        primary_key=True)
+    id = Column('id',Integer, ForeignKey('core__reports.id'), primary_key=True)
     media_entry_id = Column(Integer, ForeignKey(MediaEntry.id), nullable=False)
 
+class ArchivedReport_v0(ReportBase_v0):
+    __tablename__ = 'core__reports_archived'
+    __mapper_args__ = {'polymorphic_identity': 'archived_report'}
+
+    id = Column('id',Integer, ForeignKey('core__reports.id'))
+
+    media_entry_id = Column(Integer, ForeignKey(MediaEntry.id))
+    comment_id = Column(Integer, ForeignKey(MediaComment.id))
+    resolver_id = Column(Integer, ForeignKey(User.id), nullable=False)
+    resolved_time = Column(DateTime)
+    result = Column(UnicodeText)
 
 class UserBan_v0(declarative_base()):
     __tablename__ = 'core__user_bans'
@@ -356,6 +361,7 @@ def create_moderation_tables(db):
     ReportBase_v0.__table__.create(db.bind)
     CommentReport_v0.__table__.create(db.bind)
     MediaReport_v0.__table__.create(db.bind)
+    ArchivedReport_v0.__table__.create(db.bind)
     UserBan_v0.__table__.create(db.bind)
     Privilege_v0.__table__.create(db.bind)
     PrivilegeUserAssociation_v0.__table__.create(db.bind)
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 01078db8..c85d546f 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -515,11 +515,18 @@ class ReportBase(Base):
             cascade="all, delete-orphan"),
         primaryjoin="User.id==ReportBase.reported_user_id")
     created = Column(DateTime, nullable=False, default=datetime.datetime.now())
-    resolved = Column(DateTime)
-    result = Column(UnicodeText)
     discriminator = Column('type', Unicode(50))
     __mapper_args__ = {'polymorphic_on': discriminator}
 
+    def is_comment_report(self):
+        return self.discriminator=='comment_report'
+
+    def is_media_entry_report(self):
+        return self.discriminator=='media_report'
+
+    def is_archived_report(self):
+        return self.discriminator=='archived_report'
+
 
 class CommentReport(ReportBase):
     """
@@ -548,10 +555,40 @@ class MediaReport(ReportBase):
     media_entry_id = Column(Integer, ForeignKey(MediaEntry.id), nullable=False)
     media_entry = relationship(
         MediaEntry, 
-        backref=backref("reports_filed_on",
+        backref=backref("reports_filed_onmod/reports/1/",
             lazy="dynamic",
             cascade="all, delete-orphan"))
 
+class ArchivedReport(ReportBase):
+    """
+    A table to keep track of reports that have been resolved
+    """
+    __tablename__ = 'core__reports_archived'
+    __mapper_args__ = {'polymorphic_identity': 'archived_report'}
+    id = Column('id',Integer, ForeignKey('core__reports.id'),
+                primary_key=True)
+
+    media_entry_id = Column(Integer, ForeignKey(MediaEntry.id))
+    media_entry = relationship(
+        MediaEntry, 
+        backref=backref("past_reports_filed_on",
+            lazy="dynamic"))
+    comment_id = Column(Integer, ForeignKey(MediaComment.id))
+    comment = relationship(
+        MediaComment, backref=backref("past_reports_filed_on",
+            lazy="dynamic"))
+
+    resolver_id = Column(Integer, ForeignKey(User.id), nullable=False)
+    resolver = relationship(
+        User, 
+        backref=backref("reports_resolved_by",
+            lazy="dynamic",
+            cascade="all, delete-orphan"),
+        primaryjoin="User.id==ArchivedReport.resolver_id")
+
+    resolved = Column(DateTime)
+    result = Column(UnicodeText)
+
 class UserBan(Base):
     """
     Holds the information on a specific user's ban-state. As long as one of 
@@ -641,7 +678,8 @@ privilege_foundations = [[u'admin'], [u'moderator'], [u'uploader'],[u'reporter']
 MODELS = [
     User, MediaEntry, Tag, MediaTag, MediaComment, Collection, CollectionItem, 
     MediaFile, FileKeynames, MediaAttachmentFile, ProcessingMetaData, ReportBase,
-    CommentReport, MediaReport, UserBan, Privilege, PrivilegeUserAssociation]
+    CommentReport, MediaReport, UserBan, Privilege, PrivilegeUserAssociation,
+    ArchivedReport]
 
 # Foundations are the default rows that are created immediately after the tables are initialized. Each entry to
 #   this dictionary should be in the format of 
diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py
index 6ffec44d..1aa0a63c 100644
--- a/mediagoblin/db/util.py
+++ b/mediagoblin/db/util.py
@@ -15,7 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from mediagoblin.db.base import Session
-from mediagoblin.db.models import MediaEntry, Tag, MediaTag, Collection
+from mediagoblin.db.models import (MediaEntry, Tag, MediaTag, Collection, \
+                                 User, Privilege, FOUNDATIONS)
 
 
 ##########################
@@ -67,6 +68,22 @@ def check_collection_slug_used(creator_id, slug, ignore_c_id):
     does_exist = Session.query(Collection.id).filter(filt).first() is not None
     return does_exist
 
+def user_privileges_to_dictionary(user_id):
+    """
+    This function accepts a users id and returns a dictionary of True or False
+    values for each privilege the user does or does not have. This allows for 
+    easier referencing of a user's privileges inside templates.
+    """
+    privilege_dictionary = {}
+    user = User.query.get(user_id)
+    users_privileges = [p_item.privilege_name for p_item in user.all_privileges]
+    for privilege_name in FOUNDATIONS[Privilege]:
+        privilege_name = privilege_name[0]
+        if privilege_name in users_privileges:
+            privilege_dictionary[privilege_name]=True
+        else:
+            privilege_dictionary[privilege_name]=False
+    return privilege_dictionary
 
 if __name__ == '__main__':
     from mediagoblin.db.open import setup_connection_and_db_from_config