aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/submit/views.py
diff options
context:
space:
mode:
authorRodney Ewing <ewing.rj@gmail.com>2013-06-12 13:56:43 -0700
committerRodney Ewing <ewing.rj@gmail.com>2013-08-26 06:33:28 -0700
commitc3cce7564a0a949c2835a948e0203e489063dfbd (patch)
treec239a1ee31eda145c0450a14a2fa6883e0890621 /mediagoblin/submit/views.py
parentbdd2242155d3192615740661ce52f6fb960d1a05 (diff)
downloadmediagoblin-c3cce7564a0a949c2835a948e0203e489063dfbd.tar.lz
mediagoblin-c3cce7564a0a949c2835a948e0203e489063dfbd.tar.xz
mediagoblin-c3cce7564a0a949c2835a948e0203e489063dfbd.zip
added tests
Diffstat (limited to 'mediagoblin/submit/views.py')
-rw-r--r--mediagoblin/submit/views.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py
index d5f05cb7..2b76abf7 100644
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@ -44,7 +44,7 @@ def submit_start(request):
First view for submitting a file.
"""
user = request.user
- if user.upload_limit:
+ if user.upload_limit >= 0:
upload_limit = user.upload_limit
else:
upload_limit = mg_globals.app_config['upload_limit']
@@ -54,8 +54,8 @@ def submit_start(request):
request,
messages.WARNING,
_('Sorry, you have reached your upload limit.'))
- return redirect(
- request, '/u/{0}'.format(user.username))
+ return redirect(request, "mediagoblin.user_pages.user_home",
+ user=request.user.username)
submit_form = submit_forms.SubmitStartForm(request.form,
license=request.user.license_preference)
@@ -105,15 +105,15 @@ def submit_start(request):
entry.queued_media_file) / (1024.0 * 1024)
file_size = float('{0:.2f}'.format(file_size))
- # Check if over upload limit
+ # Check if user is over upload limit
if (user.uploaded + file_size) >= upload_limit:
messages.add_message(
request,
messages.WARNING,
_('Sorry, uploading this file will put you over your'
' upload limit.'))
- return redirect(
- request, '/u/{0}'.format(user.username))
+ return redirect(request, "mediagoblin.user_pages.user_home",
+ user=user.username)
user.uploaded = user.uploaded + file_size
user.save()
@@ -137,7 +137,7 @@ def submit_start(request):
add_comment_subscription(request.user, entry)
return redirect(request, "mediagoblin.user_pages.user_home",
- user=request.user.username)
+ user=user.username)
except Exception as e:
'''
This section is intended to catch exceptions raised in