haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 14:50:29 +00:00
Code Issues Releases Wiki Activity

[notice] add try-except when get notice's detail

Browse Source
This commit is contained in:
lian
2015-06-12 16:15:53 +08:00
parent 5e0d106841
commit d4a5ac277d
1 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
seahub/notifications/models.py
View File

@@ -2,6 +2,7 @@
import datetime import datetime
import os import os
import json import json
import logging
from django.db import models from django.db import models
from django.db.models.signals import post_save from django.db.models.signals import post_save
@@ -16,6 +17,8 @@ from seaserv import seafile_api
from seahub.base.fields import LowerCaseCharField from seahub.base.fields import LowerCaseCharField
from seahub.base.templatetags.seahub_tags import email2nickname from seahub.base.templatetags.seahub_tags import email2nickname
# Get an instance of a logger
logger = logging.getLogger(__name__)
########## system notification ########## system notification
class Notification(models.Model): class Notification(models.Model):
@@ -477,7 +480,12 @@ class UserNotification(models.Model):
Arguments: Arguments:
- `self`: - `self`:
""" """
try:
d = json.loads(self.detail) d = json.loads(self.detail)
except Exception as e:
logger.error(e)
return _(u"Internal error")
filename = d['file_name'] filename = d['file_name']
repo_id = d['repo_id'] repo_id = d['repo_id']
repo = seafile_api.get_repo(repo_id) repo = seafile_api.get_repo(repo_id)
@@ -514,7 +522,12 @@ class UserNotification(models.Model):
Arguments: Arguments:
- `self`: - `self`:
""" """
try:
d = json.loads(self.detail) d = json.loads(self.detail)
except Exception as e:
logger.error(e)
return _(u"Internal error")
share_from = email2nickname(d['share_from']) share_from = email2nickname(d['share_from'])
repo_id = d['repo_id'] repo_id = d['repo_id']
@@ -536,7 +549,12 @@ class UserNotification(models.Model):
Arguments: Arguments:
- `self`: - `self`:
""" """
try:
d = json.loads(self.detail) d = json.loads(self.detail)
except Exception as e:
logger.error(e)
return _(u"Internal error")
share_from = email2nickname(d['share_from']) share_from = email2nickname(d['share_from'])
file_name = d['file_name'] file_name = d['file_name']
priv_share_token = d['priv_share_token'] priv_share_token = d['priv_share_token']
@@ -695,7 +713,12 @@ class UserNotification(models.Model):
Arguments: Arguments:
- `self`: - `self`:
""" """
try:
d = json.loads(self.detail) d = json.loads(self.detail)
except Exception as e:
logger.error(e)
return _(u"Internal error")
username = d['username'] username = d['username']
group_id = d['group_id'] group_id = d['group_id']
join_request_msg = d['join_request_msg'] join_request_msg = d['join_request_msg']