From 01be40a340abd0437d6d10f2e515d7d8d4ba19c5 Mon Sep 17 00:00:00 2001 From: lian Date: Mon, 24 Aug 2015 09:53:00 +0800 Subject: [PATCH] [user-info] use '/' as root dir name of shared link --- seahub/views/sysadmin.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py index 5a9ddfb632..cddd7d2097 100644 --- a/seahub/views/sysadmin.py +++ b/seahub/views/sysadmin.py @@ -592,7 +592,11 @@ def user_info(request, email): fs.delete() continue - fs.filename = os.path.basename(fs.path.rstrip('/')) + if fs.path == '/': + fs.filename = '/' + else: + fs.filename = os.path.basename(fs.path.rstrip('/')) + path = fs.path if path[-1] != '/': # Normalize dir path path += '/' @@ -624,7 +628,12 @@ def user_info(request, email): if seafile_api.get_dir_id_by_path(r.id, link.path) is None: link.delete() continue - link.dir_name = os.path.basename(link.path.rstrip('/')) + + if link.path == '/': + link.dir_name = '/' + else: + link.dir_name = os.path.basename(link.path.rstrip('/')) + link.is_upload = True p_uploadlinks.append(link) except SearpcError as e: