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 branch 'develop' into feature/insert-image

Browse Source 
# Conflicts:
#	web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
#	web/documentserver-example/csharp/DocEditor.aspx
#	web/documentserver-example/csharp/DocEditor.aspx.cs
#	web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
#	web/documentserver-example/java/src/main/webapp/editor.jsp
#	web/documentserver-example/nodejs/app.js
#	web/documentserver-example/nodejs/views/editor.ejs
#	web/documentserver-example/php/doceditor.php
#	web/documentserver-example/python/src/views/actions.py
#	web/documentserver-example/python/templates/editor.html
#	web/documentserver-example/ruby/app/models/file_model.rb
#	web/documentserver-example/ruby/app/views/home/editor.html.erb
This commit is contained in:
Alexandr Fedorov
2021-01-28 15:12:36 +03:00
parent 15580ee144 e74811a755
commit 6e81fa8996
18 changed files with 226 additions and 9 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'))

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

@ -191,9 +191,15 @@ def edit(request):
'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)
@ -203,6 +209,7 @@ def edit(request):
'historyData': json.dumps(hist['historyData']) if 'historyData' in hist else None,
'fileType': fileType,
'dataInsertImage': json.dumps(dataInsertImage)[1 : len(json.dumps(dataInsertImage)) - 1],
'dataCompareFile': dataCompareFile,
'apiUrl': config.DOC_SERV_API_URL
}
return render(request, 'editor.html', context)