haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-17 15:53:28 +00:00
Code Issues Releases Wiki Activity

View file error (#2341)

Browse Source 
* Revert "update file view page"

This reverts commit 6cac4e1fe4.

* update file view page

show msg when file can not be previewed
This commit is contained in:
lian
2018-09-05 14:14:14 +08:00
committed by Daniel Pan
parent f4ac204594
commit f20707163b
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
seahub/templates/view_file_base.html
View File

@@ -67,7 +67,11 @@
<div id="file-view" class="flex-1 ov-auto {% block file_view_extra_class %}{% endblock %}"> <div id="file-view" class="flex-1 ov-auto {% block file_view_extra_class %}{% endblock %}">
{% if err %} {% if err %}
<div id="file-view-tip"> <div id="file-view-tip">
<p class="error">{{ err }}</p> {% if err != 'invalid extension' %}
<p class="error">{{ err }}</p>
{% else %}
<p>{% trans "Online view is not applicable to this file format" %}</p>
{% endif %}
</div> </div>
{% else %} {% else %}
{% block file_view %}{% endblock %} {% block file_view %}{% endblock %}

8
seahub/views/file.py
View File

@@ -347,7 +347,9 @@ def can_preview_file(file_name, file_size, repo=None):
else: else:
return (True, None) return (True, None)
else: else:
return (False, _(u'Online view is not applicable to this file format')) # TODO: may need a better way instead of return string, and compare
# that string in templates
return (False, "invalid extension")
def send_file_access_msg_when_preview(request, repo, path, access_from): def send_file_access_msg_when_preview(request, repo, path, access_from):
""" send file access msg when user preview file from web """ send file access msg when user preview file from web
@@ -693,7 +695,7 @@ def view_lib_file(request, repo_id, path):
return_dict['err'] = _(u'Error when prepare OnlyOffice file preview page.') return_dict['err'] = _(u'Error when prepare OnlyOffice file preview page.')
if not HAS_OFFICE_CONVERTER: if not HAS_OFFICE_CONVERTER:
return_dict['err'] = _(u'Online view is not applicable to this file format') return_dict['err'] = "invalid extension"
return render(request, 'view_file_base.html', return_dict) return render(request, 'view_file_base.html', return_dict)
if file_size > OFFICE_PREVIEW_MAX_SIZE: if file_size > OFFICE_PREVIEW_MAX_SIZE:
@@ -710,7 +712,7 @@ def view_lib_file(request, repo_id, path):
# render file preview page # render file preview page
return render(request, template, return_dict) return render(request, template, return_dict)
else: else:
return_dict['err'] = _(u'Online view is not applicable to this file format') return_dict['err'] = "invalid extension"
return render(request, 'view_file_base.html', return_dict) return render(request, 'view_file_base.html', return_dict)
def view_history_file_common(request, repo_id, ret_dict): def view_history_file_common(request, repo_id, ret_dict):