heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

javascript limit validation

Browse Source
This commit is contained in:
Rodney Ewing
2013-06-27 11:18:31 -07:00
parent a80ea74702
commit 2188925bab
4 changed files with 62 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mediagoblin/submit/forms.py
View File

@@ -24,7 +24,7 @@ from mediagoblin.tools.licenses import licenses_as_choices
def get_submit_start_form(form, **kwargs):
max_file_size = mg_globals.app_config.get('max_file_size', None)
max_file_size = kwargs.get('max_file_size')
desc = None
if max_file_size:
desc = _('Max file size: {0} mb'.format(max_file_size))
@@ -50,6 +50,9 @@ def get_submit_start_form(form, **kwargs):
_('License'),
[wtforms.validators.Optional(),],
choices=licenses_as_choices())
max_file_size = wtforms.HiddenField('')
upload_limit = wtforms.HiddenField('')
uploaded = wtforms.HiddenField('')
return SubmitStartForm(form, **kwargs)

11
mediagoblin/submit/views.py
View File

@@ -57,8 +57,14 @@ def submit_start(request):
return redirect(request, "mediagoblin.user_pages.user_home",
user=request.user.username)
submit_form = submit_forms.get_submit_start_form(request.form,
license=request.user.license_preference)
max_file_size = mg_globals.app_config.get('max_file_size', None)
submit_form = submit_forms.get_submit_start_form(
request.form,
license=request.user.license_preference,
max_file_size=max_file_size,
upload_limit=upload_limit,
uploaded=user.uploaded)
if request.method == 'POST' and submit_form.validate():
if not check_file_field(request, 'file'):
@@ -108,7 +114,6 @@ def submit_start(request):
error = False
# Check if file size is over the limit
max_file_size = mg_globals.app_config.get('max_file_size', None)
if max_file_size and file_size >= max_file_size:
submit_form.file.errors.append(
_(u'Sorry, the file size is too big.'))