haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 10:58:33 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1495 from haiwen/move-dir

Browse Source 
fix bug when move dir
This commit is contained in:
xiez
2017-02-21 15:35:31 +08:00
committed by GitHub
parent f9d08673a2 616b80d188
commit 78a1384cae
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
seahub/api2/endpoints/copy_move_task.py
View File

@@ -121,10 +121,10 @@ class CopyMoveTaskView(APIView):
username = request.user.username username = request.user.username
if operation == 'move': if operation == 'move':
if dirent_type == 'dir' and src_repo_id == dst_repo_id and \ if dirent_type == 'dir' and src_repo_id == dst_repo_id and \
dst_parent_dir.startswith(src_parent_dir + '/'): dst_parent_dir.startswith(src_dirent_path + '/'):
error_msg = _(u'Can not move directory %(src)s to its subdirectory %(des)s') \ error_msg = _(u'Can not move directory %(src)s to its subdirectory %(des)s') \
% {'src': escape(src_parent_dir), 'des': escape( dst_parent_dir)} % {'src': escape(src_dirent_path), 'des': escape(dst_parent_dir)}
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
# permission check for src parent dir # permission check for src parent dir