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

Merge branch '3.1'

Browse Source
This commit is contained in:
zhengxie
2014-09-15 16:32:32 +08:00
parent 6d5e653c37 bafe7faa9b
commit a4379e0f86
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/js/jquery.fileupload.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
seahub/views/ajax.py
View File

@@ -713,7 +713,7 @@ def mv_dir(src_repo_id, src_path, dst_repo_id, dst_path, obj_name, username):
content_type = 'application/json; charset=utf-8' content_type = 'application/json; charset=utf-8'
src_dir = os.path.join(src_path, obj_name) src_dir = os.path.join(src_path, obj_name)
if dst_path.startswith(src_dir): if dst_path.startswith(src_dir + '/'):
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': src_dir, 'des': dst_path} % {'src': src_dir, 'des': dst_path}
result['error'] = error_msg result['error'] = error_msg
@@ -847,7 +847,7 @@ def mv_dirents(src_repo_id, src_path, dst_repo_id, dst_path, obj_file_names, obj
for obj_name in obj_dir_names: for obj_name in obj_dir_names:
src_dir = os.path.join(src_path, obj_name) src_dir = os.path.join(src_path, obj_name)
if dst_path.startswith(src_dir): if dst_path.startswith(src_dir + '/'):
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': src_dir, 'des': dst_path} % {'src': src_dir, 'des': dst_path}
result['error'] = error_msg result['error'] = error_msg