From b5d3aec615fd32439c9fc708d2266dc1cdfecc9d Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 4 Jun 2011 17:36:36 -0500 Subject: [PATCH] Moving all views over to using util.render_template()! --- mediagoblin/auth/views.py | 44 ++++++++++++--------------------- mediagoblin/edit/views.py | 9 +++---- mediagoblin/submit/views.py | 15 +++++------ mediagoblin/user_pages/views.py | 20 ++++++--------- mediagoblin/views.py | 10 ++++---- 5 files changed, 39 insertions(+), 59 deletions(-) diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py index e4f1a7b1..2d24328d 100644 --- a/mediagoblin/auth/views.py +++ b/mediagoblin/auth/views.py @@ -18,6 +18,7 @@ import uuid from webob import Response, exc +from mediagoblin.util import render_template from mediagoblin.db.util import ObjectId from mediagoblin.auth import lib as auth_lib from mediagoblin.auth import forms as auth_forms @@ -58,20 +59,16 @@ def register(request): location=request.urlgen("mediagoblin.auth.register_success")) # render - template = request.template_env.get_template( - 'mediagoblin/auth/register.html') return Response( - template.render( - {'request': request, - 'register_form': register_form})) + render_template( + request, 'mediagoblin/auth/register.html', + {'register_form': register_form})) def register_success(request): - template = request.template_env.get_template( - 'mediagoblin/auth/register_success.html') return Response( - template.render( - {'request': request})) + render_template( + request, 'mediagoblin/auth/register_success.html', {})) def login(request): @@ -106,12 +103,10 @@ def login(request): login_failed = True # render - template = request.template_env.get_template( - 'mediagoblin/auth/login.html') return Response( - template.render( - {'request': request, - 'login_form': login_form, + render_template( + request, 'mediagoblin/auth/login.html', + {'login_form': login_form, 'next': request.GET.get('next') or request.POST.get('next'), 'login_failed': login_failed})) @@ -146,12 +141,10 @@ def verify_email(request): else: verification_successful = False - template = request.template_env.get_template( - 'mediagoblin/auth/verify_email.html') return Response( - template.render( - {'request': request, - 'user': user, + render_template( + request, 'mediagoblin/auth/verify_email.html', + {'user': user, 'verification_successful': verification_successful})) def verify_email_notice(request): @@ -161,12 +154,9 @@ def verify_email_notice(request): When the user tries to do some action that requires their account to be verified beforehand, this view is called upon! """ - - template = request.template_env.get_template( - 'mediagoblin/auth/verification_needed.html') return Response( - template.render( - {'request': request})) + render_template( + request, 'mediagoblin/auth/verification_needed.html', {})) def resend_activation(request): @@ -186,8 +176,6 @@ def resend_activation(request): def resend_activation_success(request): - template = request.template_env.get_template( - 'mediagoblin/auth/resent_verification_email.html') return Response( - template.render( - {'request': request})) + render_template( + request, 'mediagoblin/auth/resent_verification_email.html', {})) diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index 0e0faa53..027a426c 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -17,6 +17,7 @@ from webob import Response, exc +from mediagoblin.util import render_template from mediagoblin.edit import forms from mediagoblin.edit.lib import may_edit_media from mediagoblin.decorators import require_active_login, get_user_media_entry @@ -56,10 +57,8 @@ def edit_media(request, media): user=media.uploader()['username'], media=media['slug'])) # render - template = request.template_env.get_template( - 'mediagoblin/edit/edit.html') return Response( - template.render( - {'request': request, - 'media': media, + render_template( + request, 'mediagoblin/edit/edit.html', + {'media': media, 'form': form})) diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index 262f2b12..256f5be9 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -20,6 +20,7 @@ from cgi import FieldStorage from webob import Response, exc from werkzeug.utils import secure_filename +from mediagoblin.util import render_template from mediagoblin.decorators import require_active_login from mediagoblin.submit import forms as submit_forms from mediagoblin.process_media import process_media_initial @@ -80,18 +81,14 @@ def submit_start(request): location=request.urlgen("mediagoblin.submit.success")) # render - template = request.template_env.get_template( - 'mediagoblin/submit/start.html') return Response( - template.render( - {'request': request, - 'submit_form': submit_form})) + render_template( + request, 'mediagoblin/submit/start.html', + {'submit_form': submit_form})) def submit_success(request): # render - template = request.template_env.get_template( - 'mediagoblin/submit/success.html') return Response( - template.render( - {'request': request})) + render_template( + request, 'mediagoblin/submit/success.html', {})) diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index cc9c7b21..6ea3fe36 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -16,7 +16,7 @@ from webob import Response, exc from mediagoblin.db.util import DESCENDING -from mediagoblin.util import Pagination +from mediagoblin.util import Pagination, render_template from mediagoblin.decorators import uses_pagination, get_user_media_entry @@ -42,13 +42,10 @@ def user_home(request, page): if media_entries == None: return exc.HTTPNotFound() - template = request.template_env.get_template( - 'mediagoblin/user_pages/user.html') - return Response( - template.render( - {'request': request, - 'user': user, + render_template( + request, 'mediagoblin/user_pages/user.html', + {'user': user, 'media_entries': media_entries, 'pagination': pagination})) @@ -56,12 +53,11 @@ def user_home(request, page): @get_user_media_entry def media_home(request, media): """'Homepage' of a MediaEntry()""" - template = request.template_env.get_template( - 'mediagoblin/user_pages/media.html') return Response( - template.render( - {'request': request, - 'media': media})) + render_template( + request, 'mediagoblin/user_pages/media.html', + {'media': media})) + ATOM_DEFAULT_NR_OF_UPDATED_ITEMS = 5 diff --git a/mediagoblin/views.py b/mediagoblin/views.py index dd722c63..ee0b520a 100644 --- a/mediagoblin/views.py +++ b/mediagoblin/views.py @@ -15,15 +15,15 @@ # along with this program. If not, see . from webob import Response + +from mediagoblin.util import render_template from mediagoblin.db.util import DESCENDING def root_view(request): media_entries = request.db.MediaEntry.find( {u'state': u'processed'}).sort('created', DESCENDING) - template = request.template_env.get_template( - 'mediagoblin/root.html') return Response( - template.render( - {'request': request, - 'media_entries': media_entries})) + render_template( + request, 'mediagoblin/root.html', + {'media_entries': media_entries})) -- 2.25.1