haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-08 18:30:53 +00:00
Code Issues Releases Wiki Activity

Merge branch 'lj_fileop'

Browse Source
This commit is contained in:
llj
2012-09-07 16:45:33 +08:00
parent 3610e94ebb 7c46c64656
commit 17b78ce7a4
4 changed files with 126 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
views.py
View File

@@ -1212,9 +1212,12 @@ def file_move(request):
if obj_type == 'dir':
src_dir = os.path.join(src_path, obj_name)
if dst_path.startswith(src_dir):
error_msg = u"不能把目录 %s %s到它的子目录 %s" \
error_msg = u"不能把目录 %s %s到它的子目录 %s中" \
% (src_dir, u"复制" if op == 'cp' else u"移动", dst_path)
return render_error(request, error_msg)
#return render_error(request, error_msg)
messages.add_message(request, messages.ERROR, error_msg)
url = reverse('repo', args=[src_repo_id]) + ('?p=%s' % urllib2.quote(src_path.encode('utf-8')))
return HttpResponseRedirect(url)
new_obj_name = check_filename_with_rename(dst_repo_id, dst_path, obj_name)