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/compare-file

Browse Source 
# Conflicts:
#	web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
#	web/documentserver-example/csharp/DocEditor.aspx
#	web/documentserver-example/java/src/main/webapp/editor.jsp
#	web/documentserver-example/nodejs/views/editor.ejs
#	web/documentserver-example/php/doceditor.php
#	web/documentserver-example/python/templates/editor.html
#	web/documentserver-example/ruby/app/views/home/editor.html.erb
This commit is contained in:
Alexandr Fedorov
2021-01-28 13:38:00 +03:00
parent b867d75bac 1fc1fb2b76
commit 54c6025bc5
49 changed files with 263 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,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,