update rename file error msg (#5753)

show detailed msg when failed to rename file because file is locked
haiwen · Nov 11, 2023 · 57d0aad · 57d0aad
1 parent ee40ef0
commit 57d0aad
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/frontend/src/pages/lib-content-view/lib-content-view.js b/frontend/src/pages/lib-content-view/lib-content-view.js
@@ -1037,7 +1037,14 @@ class LibContentView extends React.Component {
       seafileAPI.renameFile(repoID, path, newName).then(() => {
         this.renameItemAjaxCallback(path, newName);
       }).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')) {
           let name = Utils.getFileName(path);
           errMessage = gettext('Renaming {name} failed').replace('{name}', name);

diff --git a/seahub/api2/endpoints/file.py b/seahub/api2/endpoints/file.py
@@ -292,7 +292,7 @@ def post(self, request, repo_id, format=None):
 
             # permission check
             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)
 
             # check file lock