haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 01:44:13 +00:00
Code Issues Releases Wiki Activity

Merge pull request #971 from haiwen/revert-970-view_lib_file

Browse Source 
Revert "use "view_lib_file" instead of "view_repo_file""
This commit is contained in:
Daniel Pan
2015-12-28 16:33:22 +08:00
parent a2d895e556 4a6f2176c3
commit 32f001d9b1
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
seahub/templates/repo.html
View File

@@ -252,7 +252,6 @@ function addFile(file_data) {
var path = cur_path; var path = cur_path;
var new_name = file_data.name; var new_name = file_data.name;
var new_file = file_tpl.clone(true); var new_file = file_tpl.clone(true);
var new_file_path = e(path+new_name);
new_file.attr({ new_file.attr({
'data-name': new_name, 'data-name': new_name,
@@ -264,7 +263,7 @@ function addFile(file_data) {
'data-status': 'unstarred' 'data-status': 'unstarred'
}); });
$('.dirent-icon img', new_file).attr('src', '{{MEDIA_URL}}img/file/file.png'); $('.dirent-icon img', new_file).attr('src', '{{MEDIA_URL}}img/file/file.png');
$('.dirent-name a', new_file).html(new_name).attr('href', '{% url 'view_lib_file' repo.id new_file_path %}'); $('.dirent-name a', new_file).html(new_name).attr('href', '{% url 'repo_view_file' repo.id %}?p=' + e(path+new_name));
$('.dirent-size', new_file).html(filesizeformat(file_data.size, 1)); $('.dirent-size', new_file).html(filesizeformat(file_data.size, 1));
$('.dirent-update', new_file).html("{% trans "Just now" %}"); $('.dirent-update', new_file).html("{% trans "Just now" %}");
$('.file-download', new_file).attr('href', '{{SITE_ROOT}}repo/{{repo.id}}/' + file_data.id + '/download/?p=' + e(path+new_name)); $('.file-download', new_file).attr('href', '{{SITE_ROOT}}repo/{{repo.id}}/' + file_data.id + '/download/?p=' + e(path+new_name));
@@ -1938,8 +1937,7 @@ $('#add-new-file-form, #add-new-dir-form, #rename-form, #mv-form').submit(functi
} }
post_url = '{% url 'new_file' repo.id %}?parent_dir=' + e(path); post_url = '{% url 'new_file' repo.id %}?parent_dir=' + e(path);
after_op_success = function(data) { after_op_success = function(data) {
var new_file_path = e(path) + e(data['name']); location.href = '{% url 'repo_view_file' repo.id %}?p=' + e(path) + e(data['name']);
location.href = '{% url 'view_lib_file' repo.id new_file_path %}';
}; };
} else { } else {
post_url = '{% url 'new_dir' repo.id %}?parent_dir=' + e(path); post_url = '{% url 'new_dir' repo.id %}?parent_dir=' + e(path);

2
seahub/views/__init__.py
View File

@@ -265,7 +265,7 @@ def get_repo_dirents_with_perm(request, repo, commit, path, offset=-1, limit=-1)
view_dir_base = reverse('repo', args=[repo.id]) view_dir_base = reverse('repo', args=[repo.id])
dl_dir_base = reverse('repo_download_dir', args=[repo.id]) dl_dir_base = reverse('repo_download_dir', args=[repo.id])
view_file_base = reverse('view_lib_file', args=[repo.id, '/']) view_file_base = reverse('repo_view_file', args=[repo.id])
file_history_base = reverse('file_revisions', args=[repo.id]) file_history_base = reverse('file_revisions', args=[repo.id])
for dirent in dirs: for dirent in dirs:
dirent.last_modified = dirent.mtime dirent.last_modified = dirent.mtime