diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-10-07 15:48:33 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-10-07 15:48:33 -0500 |
| commit | 56c4ad89ebef32bd5a40c00d987811ce4501ce22 (patch) | |
| tree | 7523b2b274ce512093aed3914520275c80fe7e8f /mediagoblin/views.py | |
| parent | 345b958871c48df56b8d1acf9516bb9780aa6701 (diff) | |
| parent | 0a24db84c5769149537b0d9bd8e3a88fe8e9522a (diff) | |
| download | mediagoblin-56c4ad89ebef32bd5a40c00d987811ce4501ce22.tar.lz mediagoblin-56c4ad89ebef32bd5a40c00d987811ce4501ce22.tar.xz mediagoblin-56c4ad89ebef32bd5a40c00d987811ce4501ce22.zip | |
Merge remote-tracking branch 'refs/remotes/tilly-q/OPW-Moderation-Update'
Conflicts:
mediagoblin/templates/mediagoblin/user_pages/user.html
mediagoblin/tests/test_auth.py
mediagoblin/tests/test_submission.py
Diffstat (limited to 'mediagoblin/views.py')
| -rw-r--r-- | mediagoblin/views.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mediagoblin/views.py b/mediagoblin/views.py index 6acd7e96..1d7be813 100644 --- a/mediagoblin/views.py +++ b/mediagoblin/views.py @@ -18,10 +18,10 @@ from mediagoblin import mg_globals from mediagoblin.db.models import MediaEntry from mediagoblin.tools.pagination import Pagination from mediagoblin.tools.response import render_to_response -from mediagoblin.decorators import uses_pagination - +from mediagoblin.decorators import uses_pagination, user_not_banned +@user_not_banned @uses_pagination def root_view(request, page): cursor = MediaEntry.query.filter_by(state=u'processed').\ @@ -44,3 +44,7 @@ def simple_template_render(request): template_name = request.matchdict['template'] return render_to_response( request, template_name, {}) + +def terms_of_service(request): + return render_to_response(request, + 'mediagoblin/terms_of_service.html', {}) |