diff options
| author | Rodney Ewing <ewing.rj@gmail.com> | 2013-06-13 16:41:13 -0700 |
|---|---|---|
| committer | Rodney Ewing <ewing.rj@gmail.com> | 2013-08-26 06:33:29 -0700 |
| commit | 91a52878cfca2187943481e6fc1d376fb65cae00 (patch) | |
| tree | 6a6cfc2b51e005db39e7bc51ab24cd29f97394eb /mediagoblin | |
| parent | 150bee3f8fd5dff59843610982592dfa0f6e411a (diff) | |
| download | mediagoblin-91a52878cfca2187943481e6fc1d376fb65cae00.tar.lz mediagoblin-91a52878cfca2187943481e6fc1d376fb65cae00.tar.xz mediagoblin-91a52878cfca2187943481e6fc1d376fb65cae00.zip | |
made no upload limit the default
Diffstat (limited to 'mediagoblin')
| -rw-r--r-- | mediagoblin/config_spec.ini | 4 | ||||
| -rw-r--r-- | mediagoblin/submit/views.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index 1b9945c5..acefa5cc 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -75,8 +75,8 @@ theme = string() plugin_web_path = string(default="/plugin_static/") plugin_linked_assets_dir = string(default="%(here)s/user_dev/plugin_static/") -# User upload limit (in Mb) -upload_limit = integer(default=500) +# Default user upload limit (in Mb) +#upload_limit = integer(default=500) [jinja2] # Jinja2 supports more directives than the minimum required by mediagoblin. diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index cba9c8b4..1a67486b 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -47,9 +47,9 @@ def submit_start(request): if user.upload_limit >= 0: upload_limit = user.upload_limit 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( request, messages.WARNING, @@ -106,7 +106,7 @@ def submit_start(request): file_size = float('{0:.2f}'.format(file_size)) # 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( request, messages.WARNING, |