haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-22 11:57:34 +00:00
Code Issues Releases Wiki Activity

Fix notice email bug

Browse Source
This commit is contained in:
zhengxie
2014-06-23 14:41:04 +08:00
parent bf28e8cc1d
commit a41fb9031f
4 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
seahub/views/ajax.py
View File

@@ -1319,11 +1319,19 @@ def get_popup_notices(request):
elif notice.is_group_msg():
d = notice.group_message_detail_to_dict()
notice.msg_from = d.get('msg_from')
if d.get('msg_from') is not None:
notice.msg_from = d.get('msg_from')
else:
from seahub.avatar.util import get_default_avatar_url
notice.default_avatar_url = get_default_avatar_url()
elif notice.is_grpmsg_reply():
d = notice.grpmsg_reply_detail_to_dict()
notice.msg_from = d.get('reply_from')
if d.get('reply_from') is not None:
notice.msg_from = d.get('reply_from')
else:
from seahub.avatar.util import get_default_avatar_url
notice.default_avatar_url = get_default_avatar_url()
elif notice.is_file_uploaded_msg():
from seahub.avatar.util import get_default_avatar_url