haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-04-28 03:10:45 +00:00
Code Issues Releases Wiki Activity

Merge branch '7.0'

Browse Source
This commit is contained in:
lian 2020-02-28 13:00:23 +08:00
commit 9500ac647a
10 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frontend/src/components/file-uploader/file-uploader.js
View File

@ -2,7 +2,7 @@ import React, { Fragment } from 'react';
import PropTypes from 'prop-types';
import Resumablejs from '@seafile/resumablejs';
import MD5 from 'MD5';
import { enableResumableFileUpload, resumableUploadFileBlockSize, maxUploadFileSize } from '../../utils/constants';
import { resumableUploadFileBlockSize, maxUploadFileSize, maxNumberOfFilesForFileupload } from '../../utils/constants';
import { seafileAPI } from '../../utils/seafile-api';
import { Utils } from '../../utils/utils';
import { gettext } from '../../utils/constants';
@ -17,12 +17,10 @@ const propTypes = {
filetypes: PropTypes.array,
chunkSize: PropTypes.number,
withCredentials: PropTypes.bool,
maxFiles: PropTypes.number,
testMethod: PropTypes.string,
testChunks: PropTypes.number,
simultaneousUploads: PropTypes.number,
fileParameterName: PropTypes.string,
maxFilesErrorCallback: PropTypes.func,
minFileSizeErrorCallback: PropTypes.func,
fileTypeErrorCallback: PropTypes.func,
dragAndDrop: PropTypes.bool.isRequired,
@ -62,7 +60,7 @@ class FileUploader extends React.Component {
target: '',
query: this.setQuery || {},
fileType: this.props.filetypes,
maxFiles: this.props.maxFiles,
maxFiles: maxNumberOfFilesForFileupload || undefined,
maxFileSize: maxUploadFileSize * 1000 * 1000 || undefined,
testMethod: this.props.testMethod || 'post',
testChunks: this.props.testChunks || false,
@ -104,10 +102,10 @@ class FileUploader extends React.Component {
}
bindCallbackHandler = () => {
let {maxFilesErrorCallback, minFileSizeErrorCallback, fileTypeErrorCallback } = this.props;
let { minFileSizeErrorCallback, fileTypeErrorCallback } = this.props;
if (maxFilesErrorCallback) {
this.resumable.opts.maxFilesErrorCallback = this.props.maxFilesErrorCallback;
if (this.maxFilesErrorCallback) {
this.resumable.opts.maxFilesErrorCallback = this.maxFilesErrorCallback;
}
if (minFileSizeErrorCallback) {
@ -141,6 +139,16 @@ class FileUploader extends React.Component {
this.resumable.on('dragstart', this.onDragStart.bind(this));
}
maxFilesErrorCallback = (files, errorCount) => {
let maxFiles = maxNumberOfFilesForFileupload;
let message = gettext('Please upload no more than {maxFiles} files at a time.');
if (maxFiles === 1) {
message = gettext('Please upload no more than {maxFiles} file at a time.');
}
message = message.replace('{maxFiles}', maxFiles);
toaster.danger(message);
}
maxFileSizeErrorCallback = (file) => {
let { forbidUploadFileList } = this.state;
forbidUploadFileList.push(file);

1
frontend/src/utils/constants.js
View File

@ -59,6 +59,7 @@ export const canInvitePeople = window.app.pageOptions.canInvitePeople;
export const canLockUnlockFile = window.app.pageOptions.canLockUnlockFile;
export const customNavItems = window.app.pageOptions.customNavItems;
export const maxUploadFileSize = window.app.pageOptions.maxUploadFileSize;
export const maxNumberOfFilesForFileupload = window.app.pageOptions.maxNumberOfFilesForFileupload;
export const curNoteMsg = window.app.pageOptions.curNoteMsg;
export const curNoteID = window.app.pageOptions.curNoteID;

18
seahub/api2/endpoints/admin/library_dirents.py
View File

@ -48,6 +48,8 @@ def common_check(func):
return _decorated
def get_dirent_info(dirent):
if not dirent:
return {}
if stat.S_ISDIR(dirent.mode):
is_file = False
@ -175,13 +177,7 @@ class AdminLibraryDirent(APIView):
path = normalize_file_path(path)
try:
dirent = seafile_api.get_dirent_by_path(repo_id, path)
except SearpcError as e:
logger.error(e)
error_msg = 'Internal Server Error'
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
dirent = seafile_api.get_dirent_by_path(repo_id, path)
if not dirent:
error_msg = 'File or folder %s not found.' % path
return api_error(status.HTTP_404_NOT_FOUND, error_msg)
@ -224,13 +220,7 @@ class AdminLibraryDirent(APIView):
error_msg = 'path invalid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
try:
dirent = seafile_api.get_dirent_by_path(repo_id, path)
except Exception as e:
logger.error(e)
error_msg = 'Internal Server Error'
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
dirent = seafile_api.get_dirent_by_path(repo_id, path)
if not dirent:
error_msg = 'File or folder %s not found.' % path
return api_error(status.HTTP_404_NOT_FOUND, error_msg)

18
seahub/api2/endpoints/dir.py
View File

@ -189,9 +189,9 @@ class DirView(APIView):
'type': 'dir',
'repo_id': repo_id,
'parent_dir': os.path.dirname(dir_path.rstrip('/')),
'obj_name': dir_obj.obj_name,
'obj_id': dir_obj.obj_id,
'mtime': timestamp_to_isoformat_timestr(dir_obj.mtime),
'obj_name': dir_obj.obj_name if dir_obj else '',
'obj_id': dir_obj.obj_id if dir_obj else '',
'mtime': timestamp_to_isoformat_timestr(dir_obj.mtime) if dir_obj else '',
}
return dir_info
@ -568,18 +568,12 @@ class DirDetailView(APIView):
error_msg = 'Permission denied.'
return api_error(status.HTTP_403_FORBIDDEN, error_msg)
try:
dir_obj = seafile_api.get_dirent_by_path(repo_id, path)
except SearpcError as e:
logger.error(e)
error_msg = 'Internal Server Error'
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
dir_obj = seafile_api.get_dirent_by_path(repo_id, path)
dir_info = {
'repo_id': repo_id,
'path': path,
'name': dir_obj.obj_name,
'mtime': timestamp_to_isoformat_timestr(dir_obj.mtime),
'name': dir_obj.obj_name if dir_obj else '',
'mtime': timestamp_to_isoformat_timestr(dir_obj.mtime) if dir_obj else '',
'permission': permission,
}

17
seahub/api2/endpoints/file.py
View File

@ -53,11 +53,14 @@ class FileView(APIView):
repo = seafile_api.get_repo(repo_id)
file_obj = seafile_api.get_dirent_by_path(repo_id, file_path)
file_name = file_obj.obj_name
file_size = file_obj.size
can_preview, error_msg = can_preview_file(file_name, file_size, repo)
can_edit, error_msg = can_edit_file(file_name, file_size, repo)
if file_obj:
file_name = file_obj.obj_name
file_size = file_obj.size
can_preview, error_msg = can_preview_file(file_name, file_size, repo)
can_edit, error_msg = can_edit_file(file_name, file_size, repo)
else:
can_preview = False
can_edit = False
try:
is_locked, locked_by_me = check_file_lock(repo_id, file_path, username)
@ -70,9 +73,9 @@ class FileView(APIView):
'repo_id': repo_id,
'parent_dir': os.path.dirname(file_path),
'obj_name': file_name,
'obj_id': file_obj.obj_id,
'obj_id': file_obj.obj_id if file_obj else '',
'size': file_size,
'mtime': timestamp_to_isoformat_timestr(file_obj.mtime),
'mtime': timestamp_to_isoformat_timestr(file_obj.mtime) if file_obj else '',
'is_locked': is_locked,
'can_preview': can_preview,
'can_edit': can_edit,

13
seahub/api2/endpoints/share_links.py
View File

@ -92,11 +92,14 @@ def get_share_link_info(fileshare):
data['can_edit'] = False
if repo and path != '/' and not data['is_dir']:
dirent = seafile_api.get_dirent_by_path(repo_id, path)
try:
can_edit, error_msg = can_edit_file(obj_name, dirent.size, repo)
data['can_edit'] = can_edit
except Exception as e:
logger.error(e)
if dirent:
try:
can_edit, error_msg = can_edit_file(obj_name, dirent.size, repo)
data['can_edit'] = can_edit
except Exception as e:
logger.error(e)
else:
data['can_edit'] = False
return data

2
seahub/api2/endpoints/wiki_pages.py
View File

@ -159,7 +159,7 @@ class WikiPageContentView(APIView):
url = gen_inner_file_get_url(token, file_name)
file_response = urllib.request.urlopen(url)
content = file_response.read()
try:
dirent = seafile_api.get_dirent_by_path(repo.repo_id, path)
if dirent:

4
seahub/templates/base_for_react.html
View File

@ -99,7 +99,9 @@
{% if max_upload_file_size > 0 %}
maxUploadFileSize: {{ max_upload_file_size }},
{% endif %}
{% if max_number_of_files_for_fileupload > 0 %}
maxNumberOfFilesForFileupload: {{ max_number_of_files_for_fileupload }},
{% endif %}
{% if request.user.is_authenticated and request.cur_note %}
curNoteMsg: '{{ request.cur_note.message|urlize|escapejs }}',
curNoteID: '{{ request.cur_note.id }}',

1
seahub/views/__init__.py
View File

@ -1146,6 +1146,7 @@ def react_fake_view(request, **kwargs):
'storages': get_library_storages(request),
'enable_repo_snapshot_label': settings.ENABLE_REPO_SNAPSHOT_LABEL,
'resumable_upload_file_block_size': settings.RESUMABLE_UPLOAD_FILE_BLOCK_SIZE,
'max_number_of_files_for_fileupload': settings.MAX_NUMBER_OF_FILES_FOR_FILEUPLOAD,
'share_link_expire_days_default': settings.SHARE_LINK_EXPIRE_DAYS_DEFAULT,
'share_link_expire_days_min': SHARE_LINK_EXPIRE_DAYS_MIN,
'share_link_expire_days_max': SHARE_LINK_EXPIRE_DAYS_MAX,

2
thirdpart/shibboleth/backends.py
View File

@ -62,5 +62,7 @@ class ShibbolethRemoteUserBackend(RemoteUserBackend):
notify_admins_on_register_complete(user.email)
else:
user = None
else:
user = User.objects.get(email=username)
return user