heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made no upload limit the default

Browse Source
This commit is contained in:
Rodney Ewing 2013-06-13 16:41:13 -07:00
parent 150bee3f8f
commit 91a52878cf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mediagoblin/config_spec.ini
View File

@ -75,8 +75,8 @@ theme = string()
plugin_web_path = string(default="/plugin_static/") plugin_web_path = string(default="/plugin_static/")
plugin_linked_assets_dir = string(default="%(here)s/user_dev/plugin_static/") plugin_linked_assets_dir = string(default="%(here)s/user_dev/plugin_static/")
# User upload limit (in Mb) # Default user upload limit (in Mb)
upload_limit = integer(default=500) #upload_limit = integer(default=500)
[jinja2] [jinja2]
# Jinja2 supports more directives than the minimum required by mediagoblin. # Jinja2 supports more directives than the minimum required by mediagoblin.

6
mediagoblin/submit/views.py
View File

@ -47,9 +47,9 @@ def submit_start(request):
if user.upload_limit >= 0: if user.upload_limit >= 0:
upload_limit = user.upload_limit upload_limit = user.upload_limit
else: else:
upload_limit = mg_globals.app_config['upload_limit'] upload_limit = mg_globals.app_config.get('upload_limit', None)
if user.uploaded >= upload_limit: if upload_limit and user.uploaded >= upload_limit:
messages.add_message( messages.add_message(
request, request,
messages.WARNING, messages.WARNING,
@ -106,7 +106,7 @@ def submit_start(request):
file_size = float('{0:.2f}'.format(file_size)) file_size = float('{0:.2f}'.format(file_size))
# Check if user is over upload limit # Check if user is over upload limit
if (user.uploaded + file_size) >= upload_limit: if upload_limit and (user.uploaded + file_size) >= upload_limit:
messages.add_message( messages.add_message(
request, request,
messages.WARNING, messages.WARNING,