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

[onlyoffice] Fix doc key issue

Browse Source
This commit is contained in:
zhengxie
2017-05-31 17:32:15 +08:00
parent 3420025b9a
commit 711f1870cf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
seahub/views/file.py
View File

@@ -17,6 +17,7 @@ import re
import mimetypes import mimetypes
import urlparse import urlparse
import datetime import datetime
import hashlib
from django.core import signing from django.core import signing
from django.core.cache import cache from django.core.cache import cache
@@ -28,6 +29,7 @@ from django.http import HttpResponse, Http404, HttpResponseRedirect, HttpRespons
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
from django.template import RequestContext from django.template import RequestContext
from django.utils.http import urlquote from django.utils.http import urlquote
from django.utils.encoding import force_bytes
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.views.decorators.http import require_POST from django.views.decorators.http import require_POST
from django.template.defaultfilters import filesizeformat from django.template.defaultfilters import filesizeformat
@@ -455,7 +457,7 @@ def _file_view(request, repo_id, path):
if ENABLE_ONLYOFFICE and not repo.encrypted and \ if ENABLE_ONLYOFFICE and not repo.encrypted and \
fileext in ONLYOFFICE_FILE_EXTENSION: fileext in ONLYOFFICE_FILE_EXTENSION:
doc_key = obj_id doc_key = hashlib.md5(force_bytes(repo_id + path + obj_id)).hexdigest()[:20]
if fileext in ('xls', 'xlsx', 'ods', 'fods', 'csv'): if fileext in ('xls', 'xlsx', 'ods', 'fods', 'csv'):
document_type = 'spreadsheet' document_type = 'spreadsheet'
elif fileext in ('pptx', 'ppt', 'odp', 'fodp', 'ppsx', 'pps'): elif fileext in ('pptx', 'ppt', 'odp', 'fodp', 'ppsx', 'pps'):