haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-15 05:33:38 +00:00
Code Issues Releases Wiki Activity

update sort logic of starred items (#3011)

Browse Source 
first repos, then folders, last files
This commit is contained in:
lian 2019-02-28 12:02:03 +08:00 committed by Daniel Pan
parent 17b7234409
commit 3d2571b680
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
seahub/api2/endpoints/starred_items.py
View File

@ -45,7 +45,7 @@ class StarredItems(APIView):
item_info['path'] = path item_info['path'] = path
if path == '/': if path == '/':
item_info['obj_name'] = repo.repo_name if repo else '' item_info['obj_name'] = repo.repo_name if repo else ''
item_info['mtime'] = timestamp_to_isoformat_timestr(repo.mtime) if \ item_info['mtime'] = timestamp_to_isoformat_timestr(repo.last_modified) if \
repo else '' repo else ''
else: else:
item_info['obj_name'] = os.path.basename(path.rstrip('/')) item_info['obj_name'] = os.path.basename(path.rstrip('/'))
@ -62,7 +62,6 @@ class StarredItems(APIView):
1. all authenticated user can perform this action. 1. all authenticated user can perform this action.
""" """
result = []
email = request.user.username email = request.user.username
all_starred_items = UserStarredFiles.objects.filter(email=email) all_starred_items = UserStarredFiles.objects.filter(email=email)
@ -74,6 +73,9 @@ class StarredItems(APIView):
if repo: if repo:
repo_dict[repo_id] = repo repo_dict[repo_id] = repo
starred_repos = []
starred_folders = []
starred_files = []
for starred_item in all_starred_items: for starred_item in all_starred_items:
repo_id = starred_item.repo_id repo_id = starred_item.repo_id
@ -96,10 +98,19 @@ class StarredItems(APIView):
item_info['user_name'] = email2nickname(email) item_info['user_name'] = email2nickname(email)
item_info['user_contact_email'] = email2contact_email(email) item_info['user_contact_email'] = email2contact_email(email)
result.append(item_info) if path == '/':
starred_repos.append(item_info)
elif starred_item.is_dir:
starred_folders.append(item_info)
else:
starred_files.append(item_info)
result.sort(lambda x, y: cmp(y['mtime'], x['mtime'])) starred_repos.sort(lambda x, y: cmp(y['mtime'], x['mtime']))
return Response({'starred_item_list': result}) starred_folders.sort(lambda x, y: cmp(y['mtime'], x['mtime']))
starred_files.sort(lambda x, y: cmp(y['mtime'], x['mtime']))
return Response({'starred_item_list': starred_repos + \
starred_folders + starred_files})
def post(self, request): def post(self, request):
""" Star a file/folder. """ Star a file/folder.