haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 15:38:15 +00:00
Code Issues Releases Wiki Activity

update rename file error msg (#5753)

Browse Source 
show detailed msg when failed to rename file because file is locked
This commit is contained in:
lian
2023-11-11 17:17:41 +08:00
committed by GitHub
parent ee40ef0a49
commit 57d0aad7b7
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/pages/lib-content-view/lib-content-view.js
View File

@@ -1037,7 +1037,14 @@ class LibContentView extends React.Component {
seafileAPI.renameFile(repoID, path, newName).then(() => { seafileAPI.renameFile(repoID, path, newName).then(() => {
this.renameItemAjaxCallback(path, newName); this.renameItemAjaxCallback(path, newName);
}).catch((error) => { }).catch((error) => {
let errMessage = Utils.getErrorMsg(error);
let errMessage = "";
if (error.response.status == 403 && error.response.data && error.response.data['error_msg']) {
errMessage = error.response.data['error_msg'];
} else {
errMessage = Utils.getErrorMsg(error);
}
if (errMessage === gettext('Error')) { if (errMessage === gettext('Error')) {
let name = Utils.getFileName(path); let name = Utils.getFileName(path);
errMessage = gettext('Renaming {name} failed').replace('{name}', name); errMessage = gettext('Renaming {name} failed').replace('{name}', name);

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

@@ -292,7 +292,7 @@ class FileView(APIView):
# permission check # permission check
if parse_repo_perm(check_folder_permission(request, repo_id, parent_dir)).can_edit_on_web is False: if parse_repo_perm(check_folder_permission(request, repo_id, parent_dir)).can_edit_on_web is False:
error_msg = 'Permission denied.' error_msg = _("Permission denied.")
return api_error(status.HTTP_403_FORBIDDEN, error_msg) return api_error(status.HTTP_403_FORBIDDEN, error_msg)
# check file lock # check file lock