mirror of
https://github.com/haiwen/seahub.git
synced 2025-07-15 16:04:01 +00:00
Merge pull request #4799 from haiwen/use-go-fileserver
use go fileserver
This commit is contained in:
commit
a38eab49b8
@ -1,7 +1,7 @@
|
||||
import React, { Fragment } from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { Button, ButtonGroup } from 'reactstrap';
|
||||
import { gettext, siteRoot, canGenerateShareLink, isPro, fileAuditEnabled, name } from '../../utils/constants';
|
||||
import { gettext, siteRoot, canGenerateShareLink, isPro, fileAuditEnabled, name, fileServerRoot, useGoFileserver } from '../../utils/constants';
|
||||
import { Utils } from '../../utils/utils';
|
||||
import { seafileAPI } from '../../utils/seafile-api';
|
||||
import URLDecorator from '../../utils/url-decorator';
|
||||
@ -83,9 +83,23 @@ class MultipleDirOperationToolbar extends React.Component {
|
||||
location.href= url;
|
||||
return;
|
||||
}
|
||||
this.setState({
|
||||
isZipDialogOpen: true
|
||||
});
|
||||
if (!useGoFileserver) {
|
||||
this.setState({
|
||||
isZipDialogOpen: true
|
||||
});
|
||||
} else {
|
||||
const target = this.props.selectedDirentList.map(dirent => dirent.name);
|
||||
seafileAPI.zipDownload(repoID, path, target).then((res) => {
|
||||
const zipToken = res.data['zip_token'];
|
||||
location.href = `${fileServerRoot}zip/${zipToken}`;
|
||||
}).catch((error) => {
|
||||
let errorMsg = Utils.getErrorMsg(error);
|
||||
this.setState({
|
||||
isLoading: false,
|
||||
errorMsg: errorMsg
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -15,6 +15,7 @@ export const isPro = window.app.config.isPro === 'True';
|
||||
export const isDocs = window.app.config.isDocs === 'True';
|
||||
export const lang = window.app.config.lang;
|
||||
export const fileServerRoot = window.app.config.fileServerRoot;
|
||||
export const useGoFileserver = window.app.config.useGoFileserver;
|
||||
export const seafileVersion = window.app.config.seafileVersion;
|
||||
export const serviceURL = window.app.config.serviceURL;
|
||||
export const appAvatarURL = window.app.config.avatarURL;
|
||||
|
@ -15,6 +15,8 @@ from django.conf import settings as dj_settings
|
||||
from django.utils.functional import lazy
|
||||
from constance import config
|
||||
|
||||
import seaserv
|
||||
|
||||
from seahub.settings import SEAFILE_VERSION, SITE_TITLE, SITE_NAME, \
|
||||
MAX_FILE_NAME, LOGO_PATH, BRANDING_CSS, LOGO_WIDTH, LOGO_HEIGHT,\
|
||||
SHOW_REPO_DOWNLOAD_BUTTON, SITE_ROOT, ENABLE_GUEST_INVITATION, \
|
||||
@ -132,6 +134,7 @@ def base(request):
|
||||
'CSRF_COOKIE_NAME': dj_settings.CSRF_COOKIE_NAME,
|
||||
'constance_enabled': dj_settings.CONSTANCE_ENABLED,
|
||||
'FILE_SERVER_ROOT': file_server_root,
|
||||
'USE_GO_FILESERVER': seaserv.USE_GO_FILESERVER if hasattr(seaserv, 'USE_GO_FILESERVER') else False,
|
||||
'LOGIN_URL': dj_settings.LOGIN_URL,
|
||||
'LOGOUT_URL': dj_settings.LOGOUT_URL,
|
||||
'enable_thumbnail': ENABLE_THUMBNAIL,
|
||||
|
@ -45,6 +45,7 @@
|
||||
isDocs: '{{ is_docs }}',
|
||||
lang: '{{ LANGUAGE_CODE }}',
|
||||
fileServerRoot: '{{ FILE_SERVER_ROOT }}',
|
||||
useGoFileserver: {% if USE_GO_FILESERVER %} true {% else %} false {% endif %},
|
||||
serviceURL: '{{ service_url }}',
|
||||
seafileVersion: '{{ seafile_version }}',
|
||||
avatarURL: '{{ avatar_url }}'
|
||||
|
Loading…
Reference in New Issue
Block a user