pengjunjie/document-server-integration
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/document-server-integration.git synced 2026-04-07 14:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop' into feature/config-refactor

Browse Source 
# Conflicts:
#	web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
#	web/documentserver-example/python/src/views/actions.py
#	web/documentserver-example/ruby/config/application.rb
This commit is contained in:
Alexandr Fedorov
2021-01-29 12:49:30 +03:00
parent 7f95d59394 4eb4753c01
commit dae246e8a2
56 changed files with 653 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/documentserver-example/python/src/settings.py
View File

@ -96,4 +96,4 @@ USE_TZ = True
STATIC_ROOT = ''
STATIC_URL = '/static/'
STATICFILES_DIRS = ( os.path.join('static'), os.path.join(config.STORAGE_PATH) )
STATICFILES_DIRS = ( os.path.join('static'), os.path.join(config.STORAGE_PATH), os.path.join('samples'))

17
web/documentserver-example/python/src/views/actions.py
View File

@ -142,7 +142,7 @@ def edit(request):
'author': 'Me',
'created': datetime.today().strftime('%d.%m.%Y %H:%M:%S')
}
infObj['favorite'] = request.COOKIES.get('uid') == 'uid-2' if request.COOKIES.get('uid') else None
edConfig = {
'type': edType,
'documentType': fileType,
@ -187,8 +187,20 @@ def edit(request):
}
}
dataInsertImage = {
'fileType': 'png',
'url': config.EXAMPLE_DOMAIN + 'static/images/logo.png'
}
dataCompareFile = {
'fileType': 'docx',
'url': config.EXAMPLE_DOMAIN + 'static/sample.docx'
}
if jwtManager.isEnabled():
edConfig['token'] = jwtManager.encode(edConfig)
dataInsertImage['token'] = jwtManager.encode(dataInsertImage)
dataCompareFile['token'] = jwtManager.encode(dataCompareFile)
hist = historyManager.getHistoryObject(storagePath, filename, docKey, fileUri, request)
@ -198,6 +210,9 @@ def edit(request):
'historyData': json.dumps(hist['historyData']) if 'historyData' in hist else None,
'fileType': fileType,
'apiUrl': config.DOC_SERV_SITE_URL + config.DOC_SERV_API_URL
'dataInsertImage': json.dumps(dataInsertImage)[1 : len(json.dumps(dataInsertImage)) - 1],
'dataCompareFile': dataCompareFile,
'apiUrl': config.DOC_SERV_API_URL
}
return render(request, 'editor.html', context)