haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-12 04:12:16 +00:00
Code Issues Releases Wiki Activity

return group member avatar url

Browse Source
This commit is contained in:
lian 2015-12-03 12:00:21 +08:00 committed by llj
parent fa42d59cc8
commit aedbf5174b
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
seahub/api2/views.py
View File

@ -39,6 +39,8 @@ from .utils import is_repo_writable, is_repo_accessible, \
get_person_msgs, api_group_check, get_email, get_timestamp, \ get_person_msgs, api_group_check, get_email, get_timestamp, \
get_group_message_json, get_group_msgs, get_group_msgs_json, get_diff_details, \ get_group_message_json, get_group_msgs, get_group_msgs_json, get_diff_details, \
json_response, to_python_boolean, is_seafile_pro json_response, to_python_boolean, is_seafile_pro
from seahub.avatar.settings import AVATAR_DEFAULT_SIZE
from seahub.avatar.templatetags.avatar_tags import api_avatar_url, avatar from seahub.avatar.templatetags.avatar_tags import api_avatar_url, avatar
from seahub.avatar.templatetags.group_avatar_tags import api_grp_avatar_url, \ from seahub.avatar.templatetags.group_avatar_tags import api_grp_avatar_url, \
grp_avatar grp_avatar
@ -3462,6 +3464,12 @@ class GroupMembers(APIView):
except ValueError: except ValueError:
return api_error(status.HTTP_400_BAD_REQUEST, 'Invalid group ID') return api_error(status.HTTP_400_BAD_REQUEST, 'Invalid group ID')
try:
avatar_size = int(request.GET.get('avatar_size',
AVATAR_DEFAULT_SIZE))
except ValueError:
avatar_size = AVATAR_DEFAULT_SIZE
try: try:
group = seaserv.get_group(group_id_int) group = seaserv.get_group(group_id_int)
except SearpcError as e: except SearpcError as e:
@ -3489,10 +3497,13 @@ class GroupMembers(APIView):
'Failed to get group members.') 'Failed to get group members.')
members_json = [] members_json = []
for m in members: for m in members:
avatar_url, is_default, date_uploaded = api_avatar_url(m.user_name,
avatar_size)
members_json.append({ members_json.append({
'username': m.user_name, 'username': m.user_name,
"fullname": email2nickname(m.user_name), "fullname": email2nickname(m.user_name),
"avatar": avatar(m.user_name, 32) "avatar_url": request.build_absolute_uri(avatar_url),
}) })
return HttpResponse(json.dumps(members_json), return HttpResponse(json.dumps(members_json),