haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-31 06:34:40 +00:00
Code Issues Releases Wiki Activity

fixed view office docs/pdf through shared link

Browse Source
This commit is contained in:
lins05
2013-06-02 10:12:08 +08:00
parent 20cdf22e34
commit ea44431118
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
seahub/views/__init__.py
View File

@@ -1119,7 +1119,7 @@ def repo_file_get(raw_path, file_enc):
return err, file_content, encoding return err, file_content, encoding
def get_file_content(filetype, raw_path, obj_id, fileext, file_enc): def get_file_content(filetype, raw_path, obj_id, fileext, file_enc, ret_dict):
err = '' err = ''
file_content = '' file_content = ''
html_exists = False html_exists = False
@@ -1712,6 +1712,7 @@ def view_shared_file(request, token):
if not repo: if not repo:
raise Http404 raise Http404
ret_dict = {}
access_token = seafserv_rpc.web_get_access_token(repo.id, obj_id, access_token = seafserv_rpc.web_get_access_token(repo.id, obj_id,
'view', '') 'view', '')
@@ -1724,7 +1725,7 @@ def view_shared_file(request, token):
file_enc = request.GET.get('file_enc', 'auto') file_enc = request.GET.get('file_enc', 'auto')
if not file_enc in FILE_ENCODING_LIST: if not file_enc in FILE_ENCODING_LIST:
file_enc = 'auto' file_enc = 'auto'
err, file_content, html_exists, filetype, encoding = get_file_content(filetype, raw_path, obj_id, fileext, file_enc) err, file_content, html_exists, filetype, encoding = get_file_content(filetype, raw_path, obj_id, fileext, file_enc, ret_dict)
file_encoding_list = FILE_ENCODING_LIST file_encoding_list = FILE_ENCODING_LIST
if encoding and encoding not in FILE_ENCODING_LIST: if encoding and encoding not in FILE_ENCODING_LIST:
file_encoding_list.append(encoding) file_encoding_list.append(encoding)
@@ -1761,6 +1762,7 @@ def view_shared_file(request, token):
'file_encoding_list':file_encoding_list, 'file_encoding_list':file_encoding_list,
'html_exists': html_exists, 'html_exists': html_exists,
'use_pdfjs':USE_PDFJS, 'use_pdfjs':USE_PDFJS,
'html_detail': ret_dict.get('html_detail', {}),
}, context_instance=RequestContext(request)) }, context_instance=RequestContext(request))
def view_shared_dir(request, token): def view_shared_dir(request, token):
@@ -1835,6 +1837,7 @@ def view_file_via_shared_dir(request, token):
if not file_id: if not file_id:
return render_error(request, _(u'File does not exist')) return render_error(request, _(u'File does not exist'))
ret_dict = {}
access_token = seafserv_rpc.web_get_access_token(repo.id, file_id, access_token = seafserv_rpc.web_get_access_token(repo.id, file_id,
'view', '') 'view', '')
filetype, fileext = get_file_type_and_ext(file_name) filetype, fileext = get_file_type_and_ext(file_name)
@@ -1844,7 +1847,7 @@ def view_file_via_shared_dir(request, token):
file_enc = request.GET.get('file_enc', 'auto') file_enc = request.GET.get('file_enc', 'auto')
if not file_enc in FILE_ENCODING_LIST: if not file_enc in FILE_ENCODING_LIST:
file_enc = 'auto' file_enc = 'auto'
err, file_content, html_exists, filetype, encoding = get_file_content(filetype, raw_path, file_id, fileext, file_enc) err, file_content, html_exists, filetype, encoding = get_file_content(filetype, raw_path, file_id, fileext, file_enc, ret_dict)
file_encoding_list = FILE_ENCODING_LIST file_encoding_list = FILE_ENCODING_LIST
if encoding and encoding not in FILE_ENCODING_LIST: if encoding and encoding not in FILE_ENCODING_LIST:
file_encoding_list.append(encoding) file_encoding_list.append(encoding)
@@ -1881,6 +1884,7 @@ def view_file_via_shared_dir(request, token):
'use_pdfjs':USE_PDFJS, 'use_pdfjs':USE_PDFJS,
'zipped': zipped, 'zipped': zipped,
'token': token, 'token': token,
'html_detail': ret_dict.get('html_detail', {}),
}, context_instance=RequestContext(request)) }, context_instance=RequestContext(request))
def demo(request): def demo(request):