paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 05:23:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor zerver.lib.upload.upload_message_image_through_web_client.

Browse Source 
upload_message_image_through_web_client -> upload_message_image_from_request
This commit is contained in:
rahuldeve
2016-06-09 15:46:38 +05:30
committed by Tim Abbott
parent 39eaf02b40
commit 3e3462da0d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/lib/upload.py
View File

@@ -287,7 +287,7 @@ def create_attachment(file_name, path_id, user_profile):
Attachment.objects.create(file_name=file_name, path_id=path_id, owner=user_profile)
return True
def upload_message_image_through_web_client(request, user_file, user_profile):
def upload_message_image_from_request(request, user_file, user_profile):
# type: (HttpRequest, File, UserProfile) -> str
uploaded_file_name, content_type = get_file_info(request, user_file)
return upload_message_image(uploaded_file_name, content_type, user_file.read(), user_profile)

4
zerver/views/upload.py
View File

@@ -7,7 +7,7 @@ from django.utils.translation import ugettext as _
from zerver.decorator import authenticated_json_post_view, zulip_login_required
from zerver.lib.request import has_request_variables, REQ
from zerver.lib.response import json_success, json_error
from zerver.lib.upload import upload_message_image_through_web_client, \
from zerver.lib.upload import upload_message_image_from_request, \
get_signed_upload_url, get_realm_for_filename
from zerver.lib.validator import check_bool
from zerver.models import UserProfile
@@ -24,7 +24,7 @@ def upload_file_backend(request, user_profile):
if ((settings.MAX_FILE_UPLOAD_SIZE * 1024 * 1024) < user_file._get_size()):
return json_error(_("File Upload is larger than allowed limit"))
uri = upload_message_image_through_web_client(request, user_file, user_profile)
uri = upload_message_image_from_request(request, user_file, user_profile)
return json_success({'uri': uri})
def serve_s3(request, user_profile, realm_id_str, filename, redir):