aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/admin/views.py
diff options
context:
space:
mode:
authortilly-Q <nattilypigeonfowl@gmail.com>2013-07-17 16:16:07 -0400
committertilly-Q <nattilypigeonfowl@gmail.com>2013-07-17 16:16:07 -0400
commit6bba33d7e6fbb0cedc39f9a11f816fe5bd372ae7 (patch)
treee72b59ff0f0b749739c3b38c84699fd43464343d /mediagoblin/admin/views.py
parent650a0aa90dacd97286a081b0b7c11abb04ba8767 (diff)
downloadmediagoblin-6bba33d7e6fbb0cedc39f9a11f816fe5bd372ae7.tar.lz
mediagoblin-6bba33d7e6fbb0cedc39f9a11f816fe5bd372ae7.tar.xz
mediagoblin-6bba33d7e6fbb0cedc39f9a11f816fe5bd372ae7.zip
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
Diffstat (limited to 'mediagoblin/admin/views.py')
-rw-r--r--mediagoblin/admin/views.py115
1 files changed, 0 insertions, 115 deletions
diff --git a/mediagoblin/admin/views.py b/mediagoblin/admin/views.py
deleted file mode 100644
index 97970577..00000000
--- a/mediagoblin/admin/views.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-from werkzeug.exceptions import Forbidden
-
-from mediagoblin.db.models import (MediaEntry, User, MediaComment, \
- CommentReport, ReportBase, Privilege)
-from mediagoblin.decorators import require_admin_login
-from mediagoblin.tools.response import render_to_response
-
-@require_admin_login
-def admin_media_processing_panel(request):
- '''
- Show the global media processing panel for this instance
- '''
- processing_entries = MediaEntry.query.filter_by(state = u'processing').\
- order_by(MediaEntry.created.desc())
-
- # Get media entries which have failed to process
- failed_entries = MediaEntry.query.filter_by(state = u'failed').\
- order_by(MediaEntry.created.desc())
-
- processed_entries = MediaEntry.query.filter_by(state = u'processed').\
- order_by(MediaEntry.created.desc()).limit(10)
-
- # Render to response
- return render_to_response(
- request,
- 'mediagoblin/admin/media_panel.html',
- {'processing_entries': processing_entries,
- 'failed_entries': failed_entries,
- 'processed_entries': processed_entries})
-
-@require_admin_login
-def admin_users_panel(request):
- '''
- Show the global panel for monitoring users in this instance
- '''
- user_list = User.query
-
- return render_to_response(
- request,
- 'mediagoblin/admin/user_panel.html',
- {'user_list': user_list})
-
-@require_admin_login
-def admin_users_detail(request):
- '''
- Shows details about a particular user.
- '''
- user = User.query.filter_by(username=request.matchdict['user']).first()
- privileges = Privilege.query
- active_reports = user.reports_filed_on.filter(
- ReportBase.resolved==None).limit(5)
- closed_reports = user.reports_filed_on.filter(
- ReportBase.resolved!=None).all()
-
- return render_to_response(
- request,
- 'mediagoblin/admin/user.html',
- {'user':user,
- 'privileges':privileges,
- 'reports':active_reports})
-
-@require_admin_login
-def admin_reports_panel(request):
- '''
- Show the global panel for monitoring reports filed against comments or
- media entries for this instance.
- '''
- report_list = ReportBase.query.filter(
- ReportBase.resolved==None).order_by(
- ReportBase.created.desc()).limit(10)
- closed_report_list = ReportBase.query.filter(
- ReportBase.resolved!=None).order_by(
- ReportBase.created.desc()).limit(10)
-
- # Render to response
- return render_to_response(
- request,
- 'mediagoblin/admin/report_panel.html',
- {'report_list':report_list,
- 'closed_report_list':closed_report_list})
-
-@require_admin_login
-def admin_reports_detail(request):
- report = ReportBase.query.get(request.matchdict['report_id'])
- if report.discriminator == 'comment_report':
- comment = MediaComment.query.get(report.comment_id)
- media_entry = None
- elif report.discriminator == 'media_report':
- media_entry = MediaEntry.query.get(report.media_entry_id)
- comment = None
-
- return render_to_response(
- request,
- 'mediagoblin/admin/report.html',
- {'report':report,
- 'media_entry':media_entry,
- 'comment':comment})
-
-