diff --git a/seahub/templates/view_trash_file.html b/seahub/templates/view_trash_file.html index 4bec1c7a80..bfff09ceca 100644 --- a/seahub/templates/view_trash_file.html +++ b/seahub/templates/view_trash_file.html @@ -7,8 +7,5 @@ {% endblock %} {% block file_path %} - {% trans "Current Path: "%} - {% for name, link in zipped %} - {% if not forloop.last %} {{ name }} / {% else %} {{ name }} {% endif %} - {% endfor %} + {% trans "Current Path: "%}{% trans "Trash" %} {% endblock %} diff --git a/seahub/views/file.py b/seahub/views/file.py index 8353e8bf6c..223e0b9379 100644 --- a/seahub/views/file.py +++ b/seahub/views/file.py @@ -679,12 +679,10 @@ def view_trash_file(request, repo_id): basedir = request.GET.get('base', '') if not basedir: raise Http404 - ret_dict['basedir'] = basedir - # generate file path navigator - path = ret_dict['path'] - repo = ret_dict['repo'] - ret_dict['zipped'] = gen_path_link(path, repo.name) + if basedir != '/': + tmp_path = posixpath.join(basedir.rstrip('/'), ret_dict['path'].lstrip('/')) + ret_dict['path'] = tmp_path return render_to_response('view_trash_file.html', ret_dict, context_instance=RequestContext(request), )