From 2a00cc35ef3dc651f01d4d81315972705e7aaceb Mon Sep 17 00:00:00 2001 From: lian Date: Thu, 30 May 2024 10:49:29 +0800 Subject: [PATCH] onlyoffice show user avatar --- seahub/onlyoffice/utils.py | 6 +++++- seahub/templates/view_file_onlyoffice.html | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/seahub/onlyoffice/utils.py b/seahub/onlyoffice/utils.py index 0137257191f..39949dcc40b 100644 --- a/seahub/onlyoffice/utils.py +++ b/seahub/onlyoffice/utils.py @@ -10,6 +10,7 @@ from seaserv import seafile_api from seahub.base.templatetags.seahub_tags import email2nickname +from seahub.avatar.templatetags.avatar_tags import api_avatar_url from seahub.utils import get_file_type_and_ext, gen_file_get_url, \ get_site_scheme_and_netloc @@ -141,6 +142,7 @@ def get_onlyoffice_dict(request, username, repo_id, file_path, file_id='', onlyoffice_editor_callback_url = reverse('onlyoffice_editor_callback') callback_url = urllib.parse.urljoin(base_url, onlyoffice_editor_callback_url) + avatar_url, _, _ = api_avatar_url(username, 72) return_dict = { 'repo_id': repo_id, 'path': file_path, @@ -154,6 +156,7 @@ def get_onlyoffice_dict(request, username, repo_id, file_path, file_id='', 'can_edit': can_edit, 'can_download': can_download, 'username': username, + 'avatar_url': avatar_url, 'onlyoffice_force_save': ONLYOFFICE_FORCE_SAVE, 'enable_watermark': ENABLE_WATERMARK, 'request_from_onlyoffice_desktop_editor': ONLYOFFICE_DESKTOP_EDITOR_HTTP_USER_AGENT in request.headers.get('user-agent', ''), @@ -188,7 +191,8 @@ def get_onlyoffice_dict(request, username, repo_id, file_path, file_id='', if request.user.is_authenticated: user_dict = { "id": username, - "name": email2nickname(username) + "name": email2nickname(username), + "avatar_url": avatar_url, } config['editorConfig']['user'] = user_dict else: diff --git a/seahub/templates/view_file_onlyoffice.html b/seahub/templates/view_file_onlyoffice.html index 2ac0f860a46..664f9234520 100644 --- a/seahub/templates/view_file_onlyoffice.html +++ b/seahub/templates/view_file_onlyoffice.html @@ -1,4 +1,4 @@ -{% load seahub_tags i18n static %} +{% load seahub_tags avatar_tags i18n static %} @@ -112,7 +112,8 @@ {% if request.user.is_authenticated %} "user": { "id": "{{ username|escapejs }}", - "name": "{{ username|email2nickname|escapejs }}" + "name": "{{ username|email2nickname|escapejs }}", + "image": "{{ avatar_url }}", } {% endif %} }