haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-17 07:41:26 +00:00
Code Issues Releases Wiki Activity

update dtable version

Browse Source
This commit is contained in:
shanshuirenjia
2019-07-27 22:30:51 +08:00
parent 45bd662103
commit d4e25c3425
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/package-lock.json generated
View File

@@ -184,9 +184,9 @@
} }
}, },
"@seafile/dtable": { "@seafile/dtable": {
"version": "0.0.82", "version": "0.0.83",
"resolved": "https://registry.npmjs.org/@seafile/dtable/-/dtable-0.0.82.tgz", "resolved": "https://registry.npmjs.org/@seafile/dtable/-/dtable-0.0.83.tgz",
"integrity": "sha512-fRyOyVT9i6cBatPCHw3QmF0w42Y8CcE9jo1OfDg9iP5WmKRMVrPAppksoyu2aPBb9UmeUtk5Lp6EQ64k756eZA==", "integrity": "sha512-IP8no7cG3YfHml6PLpEcDAr0WFxQWMioRam0wmVY7iZAs/GV+joOa3wgMCJwH7JhJt9C0+Nn/oya7KjbXHdIPg==",
"requires": { "requires": {
"@babel/plugin-proposal-export-default-from": "^7.5.2", "@babel/plugin-proposal-export-default-from": "^7.5.2",
"@babel/plugin-proposal-export-namespace-from": "^7.5.2", "@babel/plugin-proposal-export-namespace-from": "^7.5.2",

2
frontend/package.json
View File

@@ -4,7 +4,7 @@
"private": true, "private": true,
"dependencies": { "dependencies": {
"@reach/router": "^1.2.0", "@reach/router": "^1.2.0",
"@seafile/dtable": "0.0.82", "@seafile/dtable": "0.0.83",
"@seafile/resumablejs": "^1.1.9", "@seafile/resumablejs": "^1.1.9",
"@seafile/seafile-editor": "^0.2.57", "@seafile/seafile-editor": "^0.2.57",
"MD5": "^1.3.0", "MD5": "^1.3.0",

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 } = window.app.pageOptions; const { server, workspaceID, username, userNickName, contactEmail, fileName, filePath, dtableUuid, dtableServer, dtableSocket } = window.app.pageOptions;
window.dtable = {}; window.dtable = {};
window.dtable = { window.dtable = {
workspaceID: workspaceID, workspaceID: workspaceID,
@@ -13,6 +13,7 @@ window.dtable = {
contactEmail: contactEmail, contactEmail: contactEmail,
server: server, server: server,
dtableServer: dtableServer, dtableServer: dtableServer,
dtableSocket: dtableSocket,
filePath: filePath, filePath: filePath,
fileName: fileName, fileName: fileName,
dtableUuid: dtableUuid, dtableUuid: dtableUuid,

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 SHARE_LINK_EXPIRE_DAYS_DEFAULT, DTABLE_SERVER_URL, SEAFILE_COLLAB_SERVER
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
@@ -67,6 +67,7 @@ def dtable_file_view(request, workspace_id, name):
'workspace_id': workspace_id, 'workspace_id': workspace_id,
'dtable_uuid': dtable.uuid.hex, 'dtable_uuid': dtable.uuid.hex,
'dtable_server': DTABLE_SERVER_URL, 'dtable_server': DTABLE_SERVER_URL,
'dtable_socket': SEAFILE_COLLAB_SERVER
} }
return render(request, 'dtable_file_view_react.html', return_dict) return render(request, 'dtable_file_view_react.html', return_dict)

3
seahub/templates/dtable_file_view_react.html
View File

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