haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 14:50:29 +00:00
Code Issues Releases Wiki Activity

update 7.0-share_perm

Browse Source 
check if can download when view lib/trash/history/snapshot file via oos/onlyoffice
This commit is contained in:
lian
2018-11-13 15:49:02 +08:00
parent 66422e3454
commit 056d329b27
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
seahub/views/file.py
View File

@@ -735,7 +735,9 @@ def view_lib_file(request, repo_id, path):
action_name = 'edit' action_name = 'edit'
wopi_dict = get_wopi_dict(username, repo_id, path, wopi_dict = get_wopi_dict(username, repo_id, path,
action_name=action_name, language_code=request.LANGUAGE_CODE) action_name=action_name,
language_code=request.LANGUAGE_CODE,
can_download=parse_repo_perm(permission).can_download)
if wopi_dict: if wopi_dict:
if is_pro_version() and action_name == 'edit': if is_pro_version() and action_name == 'edit':
@@ -755,14 +757,15 @@ def view_lib_file(request, repo_id, path):
if ENABLE_ONLYOFFICE and fileext in ONLYOFFICE_FILE_EXTENSION: if ENABLE_ONLYOFFICE and fileext in ONLYOFFICE_FILE_EXTENSION:
can_edit = False can_edit = False
if permission == 'rw' and \ if parse_repo_perm(permission).can_edit_on_web and \
fileext in ONLYOFFICE_EDIT_FILE_EXTENSION and \ fileext in ONLYOFFICE_EDIT_FILE_EXTENSION and \
((not is_locked) or (is_locked and locked_by_me) or \ ((not is_locked) or (is_locked and locked_by_me) or \
(is_locked and locked_by_online_office)): (is_locked and locked_by_online_office)):
can_edit = True can_edit = True
onlyoffice_dict = get_onlyoffice_dict(username, repo_id, path, onlyoffice_dict = get_onlyoffice_dict(username, repo_id, path,
can_edit=can_edit) can_edit=can_edit,
can_download=parse_repo_perm(permission).can_download)
if onlyoffice_dict: if onlyoffice_dict:
if is_pro_version() and can_edit: if is_pro_version() and can_edit:
@@ -846,7 +849,8 @@ def view_history_file_common(request, repo_id, ret_dict):
# obj_id for view trash/history file # obj_id for view trash/history file
wopi_dict = get_wopi_dict(username, repo_id, path, wopi_dict = get_wopi_dict(username, repo_id, path,
language_code=request.LANGUAGE_CODE, obj_id=obj_id) language_code=request.LANGUAGE_CODE, obj_id=obj_id,
can_download=parse_repo_perm(user_perm).can_download)
if wopi_dict: if wopi_dict:
ret_dict['wopi_dict'] = wopi_dict ret_dict['wopi_dict'] = wopi_dict
@@ -856,7 +860,7 @@ def view_history_file_common(request, repo_id, ret_dict):
if ENABLE_ONLYOFFICE and fileext in ONLYOFFICE_FILE_EXTENSION: if ENABLE_ONLYOFFICE and fileext in ONLYOFFICE_FILE_EXTENSION:
onlyoffice_dict = get_onlyoffice_dict(username, repo_id, path, onlyoffice_dict = get_onlyoffice_dict(username, repo_id, path,
file_id=obj_id) file_id=obj_id, can_download=parse_repo_perm(user_perm).can_download)
if onlyoffice_dict: if onlyoffice_dict:
ret_dict['onlyoffice_dict'] = onlyoffice_dict ret_dict['onlyoffice_dict'] = onlyoffice_dict