diff options
| author | Loic Dachary <loic@dachary.org> | 2016-01-28 15:10:03 +0700 |
|---|---|---|
| committer | Boris Bobrov <breton@cynicmansion.ru> | 2016-07-25 03:48:33 +0300 |
| commit | 6c0678576aa64251b5a34e04541d4cfd36811f2e (patch) | |
| tree | 27a6c32b633a006017b71121732b8e70032e3079 /mediagoblin/plugins | |
| parent | d5421cc3666ac0e5802bd9a6e806dca5534d3a88 (diff) | |
| download | mediagoblin-6c0678576aa64251b5a34e04541d4cfd36811f2e.tar.lz mediagoblin-6c0678576aa64251b5a34e04541d4cfd36811f2e.tar.xz mediagoblin-6c0678576aa64251b5a34e04541d4cfd36811f2e.zip | |
Fix #928 - cleanup to avoid duplicated get_upload_file_limits
Signed-off-by: Loic Dachary <loic@dachary.org>
Diffstat (limited to 'mediagoblin/plugins')
| -rw-r--r-- | mediagoblin/plugins/api/views.py | 3 | ||||
| -rw-r--r-- | mediagoblin/plugins/piwigo/views.py | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/mediagoblin/plugins/api/views.py b/mediagoblin/plugins/api/views.py index 23341065..fdd22ace 100644 --- a/mediagoblin/plugins/api/views.py +++ b/mediagoblin/plugins/api/views.py @@ -52,8 +52,6 @@ def post_entry(request): _log.debug('File field not found') raise BadRequest() - upload_limit, max_file_size = get_upload_file_limits(request.user) - callback_url = request.form.get('callback_url') if callback_url: callback_url = six.text_type(callback_url) @@ -66,7 +64,6 @@ def post_entry(request): description=six.text_type(request.form.get('description')), license=six.text_type(request.form.get('license', '')), tags_string=six.text_type(request.form.get('tags', '')), - upload_limit=upload_limit, max_file_size=max_file_size, callback_url=callback_url) return json_response(get_entry_serializable(entry, request.urlgen)) diff --git a/mediagoblin/plugins/piwigo/views.py b/mediagoblin/plugins/piwigo/views.py index ab741a72..30c7ffa2 100644 --- a/mediagoblin/plugins/piwigo/views.py +++ b/mediagoblin/plugins/piwigo/views.py @@ -128,16 +128,13 @@ def pwg_images_addSimple(request): if not check_file_field(request, 'image'): raise BadRequest() - upload_limit, max_file_size = get_upload_file_limits(request.user) - try: entry = submit_media( mg_app=request.app, user=request.user, submitted_file=request.files['image'], filename=request.files['image'].filename, title=six.text_type(form.name.data), - description=six.text_type(form.comment.data), - upload_limit=upload_limit, max_file_size=max_file_size) + description=six.text_type(form.comment.data)) collection_id = form.category.data if collection_id > 0: |