haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-19 07:27:56 +00:00
Code Issues Releases Wiki Activity

dtable media_url (#3988)

Browse Source
This commit is contained in:
王健辉 2019-08-15 16:20:09 +08:00 committed by Daniel Pan
parent 1464b86bd6
commit aea002bbc0
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/view-file-dtable.js
View File

@ -4,7 +4,7 @@ import { seafileAPI } from './utils/seafile-api';
import ViewFileDtable from '@seafile/dtable/es'; import ViewFileDtable from '@seafile/dtable/es';
import './css/view-file-dtable.css'; import './css/view-file-dtable.css';
const { server, workspaceID, username, userNickName, contactEmail, fileName, filePath, dtableUuid, dtableServer, dtableSocket } = window.app.pageOptions; const { server, workspaceID, username, userNickName, contactEmail, fileName, filePath, dtableUuid, dtableServer, dtableSocket, mediaUrl } = window.app.pageOptions;
window.dtable = {}; window.dtable = {};
window.dtable = { window.dtable = {
workspaceID: workspaceID, workspaceID: workspaceID,
@ -17,6 +17,7 @@ window.dtable = {
filePath: filePath, filePath: filePath,
fileName: fileName, fileName: fileName,
dtableUuid: dtableUuid, dtableUuid: dtableUuid,
mediaUrl: mediaUrl,
accessToken: '' accessToken: ''
}; };

3
seahub/dtable/views.py
View File

@ -11,7 +11,7 @@ from seahub.utils import normalize_file_path, render_error, render_permission_er
gen_file_get_url, get_file_type_and_ext, IMAGE gen_file_get_url, get_file_type_and_ext, IMAGE
from seahub.auth.decorators import login_required from seahub.auth.decorators import login_required
from seahub.settings import SHARE_LINK_EXPIRE_DAYS_MIN, SHARE_LINK_EXPIRE_DAYS_MAX, \ from seahub.settings import SHARE_LINK_EXPIRE_DAYS_MIN, SHARE_LINK_EXPIRE_DAYS_MAX, \
SHARE_LINK_EXPIRE_DAYS_DEFAULT, DTABLE_SERVER_URL, SEAFILE_COLLAB_SERVER SHARE_LINK_EXPIRE_DAYS_DEFAULT, DTABLE_SERVER_URL, SEAFILE_COLLAB_SERVER, MEDIA_URL
from seahub.dtable.utils import check_dtable_share_permission, check_dtable_permission from seahub.dtable.utils import check_dtable_share_permission, check_dtable_permission
from seahub.constants import PERMISSION_ADMIN, PERMISSION_READ_WRITE from seahub.constants import PERMISSION_ADMIN, PERMISSION_READ_WRITE
@ -66,6 +66,7 @@ def dtable_file_view(request, workspace_id, name):
'filetype': 'dtable', 'filetype': 'dtable',
'workspace_id': workspace_id, 'workspace_id': workspace_id,
'dtable_uuid': dtable.uuid.hex, 'dtable_uuid': dtable.uuid.hex,
'media_url': MEDIA_URL,
'dtable_server': DTABLE_SERVER_URL, 'dtable_server': DTABLE_SERVER_URL,
'dtable_socket': SEAFILE_COLLAB_SERVER 'dtable_socket': SEAFILE_COLLAB_SERVER
} }

1
seahub/templates/dtable_file_view_react.html
View File

@ -9,6 +9,7 @@
{% block extra_data %} {% block extra_data %}
workspaceID: '{{ workspace_id }}', workspaceID: '{{ workspace_id }}',
dtableUuid: '{{ dtable_uuid }}', dtableUuid: '{{ dtable_uuid }}',
mediaUrl: '{{ media_url }}',
dtableServer: '{{ dtable_server }}', dtableServer: '{{ dtable_server }}',
dtableSocket: '{{ dtable_socket }}' dtableSocket: '{{ dtable_socket }}'
{% endblock %} {% endblock %}