diff options
author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-06 14:46:56 +0200 |
---|---|---|
committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-06 14:46:56 +0200 |
commit | ec8f66bd650e580eae67ad97fbc81776365d84f2 (patch) | |
tree | 499c0c5ef2868c8f3de724133a9f468122c79589 /mediagoblin/submit/views.py | |
parent | f4b2bd93f2f9c0f5fbef5214b2fe97912857b175 (diff) | |
parent | 3aa4c668b9bfe53ed58d4ae21ed91210df7ad9ff (diff) | |
download | mediagoblin-ec8f66bd650e580eae67ad97fbc81776365d84f2.tar.lz mediagoblin-ec8f66bd650e580eae67ad97fbc81776365d84f2.tar.xz mediagoblin-ec8f66bd650e580eae67ad97fbc81776365d84f2.zip |
Merge remote-tracking branch 'gitorious/master'
Diffstat (limited to 'mediagoblin/submit/views.py')
-rw-r--r-- | mediagoblin/submit/views.py | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index 262f2b12..b409b64d 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -17,9 +17,9 @@ from os.path import splitext from cgi import FieldStorage -from webob import Response, exc from werkzeug.utils import secure_filename +from mediagoblin.util import render_to_response, redirect from mediagoblin.decorators import require_active_login from mediagoblin.submit import forms as submit_forms from mediagoblin.process_media import process_media_initial @@ -75,23 +75,14 @@ def submit_start(request): # queue it for processing process_media_initial.delay(unicode(entry['_id'])) - # redirect - return exc.HTTPFound( - location=request.urlgen("mediagoblin.submit.success")) + return redirect(request, "mediagoblin.submit.success") - # render - template = request.template_env.get_template( - 'mediagoblin/submit/start.html') - return Response( - template.render( - {'request': request, - 'submit_form': submit_form})) + return render_to_response( + 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})) + return render_to_response( + request, 'mediagoblin/submit/success.html', {}) |