aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/views.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-10-11 11:48:22 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-10-11 11:48:22 -0500
commit9d2b0161b9e6f570e7b429127d6ebb83c125c1c6 (patch)
treea3e9d58d55e2b1e45ecafe4ba7e2658408517374 /mediagoblin/views.py
parent0c875e1e96b77892bd3f9bd5a91959c57ab7b91c (diff)
downloadmediagoblin-9d2b0161b9e6f570e7b429127d6ebb83c125c1c6.tar.lz
mediagoblin-9d2b0161b9e6f570e7b429127d6ebb83c125c1c6.tar.xz
mediagoblin-9d2b0161b9e6f570e7b429127d6ebb83c125c1c6.zip
Make showing the Terms of Service a user option, and move it to the footer.
This commit sponsored by Gjalt-Jorn Peters. Thank you!
Diffstat (limited to 'mediagoblin/views.py')
-rw-r--r--mediagoblin/views.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/mediagoblin/views.py b/mediagoblin/views.py
index 1d7be813..4185c1b6 100644
--- a/mediagoblin/views.py
+++ b/mediagoblin/views.py
@@ -17,7 +17,7 @@
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.tools.response import render_to_response, render_404
from mediagoblin.decorators import uses_pagination, user_not_banned
@@ -46,5 +46,8 @@ def simple_template_render(request):
request, template_name, {})
def terms_of_service(request):
+ if mg_globals.app_config["show_tos"] is False:
+ return render_404(request)
+
return render_to_response(request,
'mediagoblin/terms_of_service.html', {})