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

Merge pull request #604 from haiwen/notice-update

Browse Source 
[notice] update code
This commit is contained in:
xiez
2015-05-21 15:25:30 +08:00
parent 132d0cd828 b294918a76
commit f2cb1f1064
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
seahub/notifications/views.py
View File

@@ -1,4 +1,6 @@
import json import json
import logging
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.contrib import messages from django.contrib import messages
@@ -14,6 +16,9 @@ from seahub.notifications.models import Notification, NotificationForm, \
from seahub.notifications.utils import refresh_cache from seahub.notifications.utils import refresh_cache
from seahub.avatar.util import get_default_avatar_url from seahub.avatar.util import get_default_avatar_url
# Get an instance of a logger
logger = logging.getLogger(__name__)
@login_required @login_required
def notification_list(request): def notification_list(request):
if not request.user.is_staff: if not request.user.is_staff:
@@ -135,7 +140,10 @@ def add_notice_from_info(notices):
for notice in notices: for notice in notices:
if notice.is_user_message(): if notice.is_user_message():
d = notice.user_message_detail_to_dict() d = notice.user_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:
notice.default_avatar_url = default_avatar_url
elif notice.is_group_msg(): elif notice.is_group_msg():
d = notice.group_message_detail_to_dict() d = notice.group_message_detail_to_dict()
@@ -154,17 +162,21 @@ def add_notice_from_info(notices):
elif notice.is_file_uploaded_msg(): elif notice.is_file_uploaded_msg():
notice.default_avatar_url = default_avatar_url notice.default_avatar_url = default_avatar_url
elif notice.is_repo_share_msg(): elif notice.is_repo_share_msg() or notice.is_priv_file_share_msg():
d = json.loads(notice.detail) try:
notice.msg_from = d['share_from'] d = json.loads(notice.detail)
notice.msg_from = d['share_from']
elif notice.is_priv_file_share_msg(): except Exception as e:
d = json.loads(notice.detail) logger.error(e)
notice.msg_from = d['share_from'] notice.default_avatar_url = default_avatar_url
elif notice.is_group_join_request(): elif notice.is_group_join_request():
d = json.loads(notice.detail) try:
notice.msg_from = d['username'] d = json.loads(notice.detail)
notice.msg_from = d['username']
except Exception as e:
logger.error(e)
notice.default_avatar_url = default_avatar_url
else: else:
pass pass