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

Merge pull request #655 from haiwen/raw-path

Browse Source 
fix bug when view img file in sub dir of shared dir
This commit is contained in:
Daniel Pan
2015-06-18 17:20:27 +08:00
parent 1c2ee66324 7cda286653
commit 52a0d7843a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seahub/templates/view_shared_dir.html
View File

@@ -68,7 +68,7 @@
<td> <td>
{% if dirent.is_img %} {% if dirent.is_img %}
<a class="normal img-name-link" href="{% url "view_file_via_shared_dir" token %}?p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}" data-mfp-src="{% url "view_raw_shared_file" token dirent.obj_id dirent.obj_name %}">{{ dirent.obj_name }}</a> <a class="normal img-name-link" href="{% url "view_file_via_shared_dir" token %}?p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}" data-mfp-src="{% url "view_raw_shared_file" token dirent.obj_id dirent.obj_name %}?p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}">{{ dirent.obj_name }}</a>
{% else %} {% else %}
<a class="normal" href="{% url "view_file_via_shared_dir" token %}?p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}">{{ dirent.obj_name }}</a> <a class="normal" href="{% url "view_file_via_shared_dir" token %}?p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}">{{ dirent.obj_name }}</a>
{% endif %} {% endif %}

10
seahub/views/file.py
View File

@@ -810,10 +810,14 @@ def view_raw_shared_file(request, token, obj_id, file_name):
raise Http404 raise Http404
# Normalize file path based on file or dir share link # Normalize file path based on file or dir share link
if fileshare.is_file_share_link(): req_path = request.GET.get('p', '').rstrip('/')
file_path = fileshare.path.rstrip('/') if req_path:
file_path = posixpath.join(fileshare.path, req_path.lstrip('/'))
else: else:
file_path = fileshare.path.rstrip('/') + '/' + file_name if fileshare.is_file_share_link():
file_path = fileshare.path.rstrip('/')
else:
file_path = fileshare.path.rstrip('/') + '/' + file_name
real_obj_id = seafile_api.get_file_id_by_path(repo_id, file_path) real_obj_id = seafile_api.get_file_id_by_path(repo_id, file_path)
if not real_obj_id: if not real_obj_id: