Whew. This is a big update. I did some significant keeping work. I moved all of

the folders and enpoints labeled 'admin' to the more accurate term of 'moderat-
ion.' I also created the ability for admins and moderators to add or remove pr-
ivileges or to ban a user in response to a report. This also meant implementing
the UserBan class in various places. I also had to add a column called result
to the ReportBase table. This allows the moderator/admin to leave comments when
they respond to a report, allowing for archiving of what responses they do/n't
take.

--\ mediagoblin/db/migrations.py
--| Added result column to ReportBase

--\ mediagoblin/db/models.py
--| Added result column to ReportBase
--| Added documentation to tables I had made previously

--\ mediagoblin/decorators.py
--| Editted the user_has_privilege decorator to check whether a user has been
  | banned or not
--| Created a seperate user_not_banned decorator to prevent banned users from
  | accessing any pages
--| Changed require_admin_login into require_admin_or_moderator login

--\ mediagoblin/gmg_commands/users.py
--| Made the gmg command `adduser` create a user w/ the appropriate privileges

--\ mediagoblin/moderation/routing.py  << formerly mediagoblin/admin/routing.py
--| Renamed all of the routes from admin -> moderation

--\ mediagoblin/routing.py
--| Renamed all of the routes from admin -> moderation

--\ mediagoblin/moderation/views.py << formerly mediagoblin/admin/views.py
--| Renamed all of the routes & functions from admin -> moderation
--| Expanded greatly on the moderation_reports_detail view and functionality
--| Added in the give_or_take_away_privilege form, however this might be a use-
  | -less function which I could remove (because privilege changes should happe-
  | n in response to a report so they can be archived and visible)

--\ mediagoblin/static/css/base.css
--| Added in a style for the reports_detail page

--\ mediagoblin/templates/mediagoblin/base.html
--| Renamed all of the routes from admin -> moderation

--\ mediagoblin/templates/mediagoblin/moderation/report.html
--| Added form to allow moderators and admins to respond to reports.

--\ mediagoblin/templates/mediagoblin/moderation/reports_panel.html
--| Fixed the table for closed reports

--\ mediagoblin/templates/mediagoblin/moderation/user.html
--| Added in a table w/ all of the user's privileges and the option to add or
  | remove them. Again, this is probably vestigial
--| Renamed all of the routes from admin -> moderation

--\ mediagoblin/templates/mediagoblin/moderation/user_panel.html
--| Renamed all of the routes from admin -> moderation

--\ mediagoblin/tools/response.py
--| Added function render_user_banned, this is the view function for the redir-
  | -ect that happens when a user tries to access the site whilst banned

--\ mediagoblin/user_pages/forms.py
--| Added important translate function where I had text

--\ mediagoblin/user_pages/lib.py
--| Renamed functiion for clarity

--\ mediagoblin/user_pages/views.py
--| Added the user_not_banned decorator to every view

--\ mediagoblin/views.py
--| Added the user_not_banned decorator

--\ mediagoblin/moderation/forms.py
--| Created this new file

--\ mediagoblin/templates/mediagoblin/banned.html
--| Created this new file
--| This is the page which people are redirected to when they access the site
  | while banned

1 files changed, 43 insertions, 5 deletions

diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index e4c97a2c..01078db8 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -239,8 +239,8 @@ class MediaEntry(Base, MediaEntryMixin):
         This will *not* automatically delete unused collections, which
         can remain empty...
 
-        :param del_orphan_tags: True/false if we delete unused Tags too
-        :param commit: True/False if this should end the db transaction"""
+        :keyword del_orphan_tags: True/false if we delete unused Tags too
+        :keyword commit: True/False if this should end the db transaction"""
         # User's CollectionItems are automatically deleted via "cascade".
         # Comments on this Media are deleted by cascade, hopefully.
 
@@ -487,6 +487,14 @@ class ProcessingMetaData(Base):
 
 class ReportBase(Base):
     """
+    This is the basic report table which the other reports are based off of.
+        :keyword reporter_id
+        :keyword report_content
+        :keyword reported_user_id
+        :keyword created
+        :keyword resolved
+        :keyword result
+        :keyword discriminator
 
     """
     __tablename__ = 'core__reports'
@@ -508,6 +516,7 @@ class ReportBase(Base):
         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}
 
@@ -551,13 +560,13 @@ class UserBan(Base):
         the reason why they are banned and when (if ever) the ban will be 
         lifted
 
-        :param user_id          Holds the id of the user this object is 
+        :keyword user_id          Holds the id of the user this object is 
                                     attached to. This is a one-to-one 
                                     relationship.
-        :param expiration_date  Holds the date that the ban will be lifted. 
+        :keyword expiration_date  Holds the date that the ban will be lifted. 
                                     If this is null, the ban is permanent 
                                     unless a moderator manually lifts it.
-        :param reason           Holds the reason why the user was banned.
+        :keyword reason           Holds the reason why the user was banned.
     """
     __tablename__ = 'core__user_bans'
 
@@ -568,6 +577,17 @@ class UserBan(Base):
 
 
 class Privilege(Base):
+    """
+    The Privilege table holds all of the different privileges a user can hold.
+    If a user 'has' a privilege, the User object is in a relationship with the
+    privilege object. 
+
+        :keyword privilege_name   Holds a unicode object that is the recognizable
+                                    name of this privilege. This is the column 
+                                    used for identifying whether or not a user
+                                    has a necessary privilege or not.
+                                
+    """
     __tablename__ = 'core__privileges'
 
     id = Column(Integer, nullable=False, primary_key=True)
@@ -578,12 +598,30 @@ class Privilege(Base):
         secondary="core__privileges_users")
 
     def __init__(self, privilege_name):
+        '''
+        Currently consructors are required for tables that are initialized thru
+        the FOUNDATIONS system. This is because they need to be able to be con-
+        -structed by a list object holding their arg*s
+        '''
         self.privilege_name = privilege_name
 
     def __repr__(self):
         return "<Privilege %s>" % (self.privilege_name)
 
+    def is_admin_or_moderator(self):
+        '''
+        This method is necessary to check if a user is able to take moderation
+        actions.
+        '''
+        
+        return (self.privilege_name==u'admin' or 
+                self.privilege_name==u'moderator')
+
 class PrivilegeUserAssociation(Base):
+    '''
+    This table holds the many-to-many relationship between User and Privilege
+    '''
+    
     __tablename__ = 'core__privileges_users'
 
     privilege_id = Column(