haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-17 07:41:26 +00:00
Code Issues Releases Wiki Activity

[api] refactor group_msg_to_json

Browse Source
This commit is contained in:
zhengxie
2014-04-28 13:52:13 +08:00
parent e499ca6927
commit 6737e0395c
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
seahub/api2/utils.py
View File

@@ -311,25 +311,21 @@ def get_timestamp(msgtimestamp):
def group_msg_to_json(msg, get_all_replies):
ret = {
'from_email' : msg.from_email,
'nickname' : email2nickname(msg.from_email),
'timestamp' : get_timestamp(msg.timestamp),
'msg' : msg.message,
'msgid' : msg.id,
'from_email': msg.from_email,
'nickname': email2nickname(msg.from_email),
'timestamp': get_timestamp(msg.timestamp),
'msg': msg.message,
'msgid': msg.id,
}
try:
atts = MessageAttachment.objects.filter(group_message_id=msg.id)
except MessageAttachment.DoesNotExist:
atts = []
atts_json = []
atts = MessageAttachment.objects.filter(group_message_id=msg.id)
for att in atts:
att_json = {
'path' : att.path,
'repo' : att.repo_id,
'type' : att.attach_type,
'src' : att.src,
'path': att.path,
'repo': att.repo_id,
'type': att.attach_type,
'src': att.src,
}
atts_json.append(att_json)
if len(atts_json) > 0: