From 6acf4ee60e3c07aea5bbd9e613335f0de1240d73 Mon Sep 17 00:00:00 2001 From: tilly-Q Date: Tue, 10 Sep 2013 13:16:22 -0400 Subject: This should be my final code update before I am ready for review! Basically, in this update I finished the search/sort function on the Reports Panel. I also finished the Terms of Service and made the decision to remove the meta portion of the site I had planned to create. I decided that the features involved were just unnecessary at this point. I also dropped the User status column and added a migration to establish default privileges (and create the privilege foundat- -ions. I fixed a few small errors that were left over as well, in the implemen- tation and in the tests. Next, I just need to await code review and work on the documentation for these new features. I also need to supervise a new merge to master. =============================================================================== Dropped the vestigial 'status' column =============================================================================== --\ mediagoblin/db/migrations.py --\ mediagoblin/db/models.py --| Also added in comments describing the current situation with the `is_admin` | and `email_verified` columns, where they are 100% vestigial but cannot be | dropped. =============================================================================== Wrote necessary migrations to set up Privilege foundations and give users the necessary privileges on an older implementation of mediagoblin that is migrating into this update =============================================================================== --\ mediagoblin/db/migrations.py =============================================================================== Deleted the meta pages =============================================================================== --\ Deleted mediagoblin/meta/__init__.py --\ Deleted mediagoblin/meta/routing.py --\ Deleted mediagoblin/meta/views.py --\ Deleted mediagoblin/templates/mediagoblin/meta/code_of_conduct.html --\ Deleted mediagoblin/templates/mediagoblin/meta/reports_details.html --\ Deleted mediagoblin/templates/mediagoblin/meta/reports_panel.html ---------------------------------------------------------------- Moved the terms of service to /terms_of_service ---------------------------------------------------------------- --\ Moved mediagoblin/templates/mediagoblin/meta/terms_of_service.html -> mediagoblin/templates/mediagoblin/terms_of_service.html --| I decided that terms of service were really the only necessary part of my | planned "meta" pages, so I moved it instead to its own singular page --\ mediagoblin/routing.py --\ mediagoblin/static/css/base.css --\ mediagoblin/templates/mediagoblin/base.html --\ mediagoblin/views.py =============================================================================== Simplified & Finished the Reports Panel Searching =============================================================================== --\ mediagoblin/moderation/forms.py --\ mediagoblin/moderation/tools.py --\ mediagoblin/moderation/views.py --\ mediagoblin/templates/mediagoblin/moderation/report_panel.html --\ mediagoblin/templates/mediagoblin/moderation/user.html =============================================================================== Fixed Small Errors =============================================================================== --\ mediagoblin/templates/mediagoblin/user_pages/user.html --\ mediagoblin/tests/test_moderation.py --\ mediagoblin/tests/tools.py =============================================================================== --- mediagoblin/moderation/forms.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'mediagoblin/moderation/forms.py') diff --git a/mediagoblin/moderation/forms.py b/mediagoblin/moderation/forms.py index 7e225fb6..78e9fcdc 100644 --- a/mediagoblin/moderation/forms.py +++ b/mediagoblin/moderation/forms.py @@ -130,27 +130,12 @@ class ReportPanelSortingForm(wtforms.Form): This form is used for sorting and filtering through different reports in the mediagoblin.moderation.reports_panel view. - Parameters that start with 'active_' refer to a sort/filter for the active - reports. - Parameters that start with 'closed_' refer to a sort/filter for the closed - reports. """ active_p = wtforms.IntegerField( - _(u'Page'), - validators=[wtforms.validators.optional()]) - active_reported_user = wtforms.IntegerField( - _(u'Reported User'), - validators=[wtforms.validators.optional()]) - active_reporter = wtforms.IntegerField( - _(u'Reporter'), validators=[wtforms.validators.optional()]) closed_p = wtforms.IntegerField( - _(u'Page'), validators=[wtforms.validators.optional()]) - closed_reported_user = wtforms.IntegerField( - _(u'Reported User'), + reported_user = wtforms.IntegerField( validators=[wtforms.validators.optional()]) - closed_reporter = wtforms.IntegerField( - _(u'Reporter'), + reporter = wtforms.IntegerField( validators=[wtforms.validators.optional()]) - -- cgit v1.2.3