haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 14:50:29 +00:00
Code Issues Releases Wiki Activity

fixed a bug in rename

Browse Source
This commit is contained in:
lins05
2012-09-02 20:10:49 +08:00
parent 39f17444c3
commit db3a7469de
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
templates/repo.html
View File

@@ -310,6 +310,7 @@ $('.file-rename, .dir-rename').click(function () {
name = $(this).attr('data'); name = $(this).attr('data');
$('#rename-target').html(type + name); $('#rename-target').html(type + name);
$('input[name="oldname"]').val(name); $('input[name="oldname"]').val(name);
$('input[name="newname"]').val(name);
$('#rename-form').modal({appendTo:'#main'}); $('#rename-form').modal({appendTo:'#main'});
return false; return false;
}); });

6
views.py
View File

@@ -1637,6 +1637,12 @@ def repo_rename_file(request):
error_msg = u"新文件名不能为空" error_msg = u"新文件名不能为空"
return render_error(request, error_msg) return render_error(request, error_msg)
if newname == oldname:
url = reverse('repo', args=[repo_id]) + ('?p=%s' % parent_dir)
return HttpResponseRedirect(url)
newname = check_filename_with_rename(repo_id, parent_dir, newname)
if len(newname) > settings.MAX_UPLOAD_FILE_NAME_LEN: if len(newname) > settings.MAX_UPLOAD_FILE_NAME_LEN:
error_msg = u"新文件名太长" error_msg = u"新文件名太长"
return render_error(request, error_msg) return render_error(request, error_msg)