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

[api2.1] update groups api when get group avatar url

Browse Source
This commit is contained in:
lian 2015-12-04 13:59:25 +08:00
parent cc1e0d0ba1
commit a084916cf8
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
seahub/api2/endpoints/groups.py
View File

@ -18,7 +18,8 @@ from pysearpc import SearpcError
from seahub.api2.utils import api_error from seahub.api2.utils import api_error
from seahub.api2.authentication import TokenAuthentication from seahub.api2.authentication import TokenAuthentication
from seahub.avatar.settings import GROUP_AVATAR_DEFAULT_SIZE from seahub.avatar.settings import GROUP_AVATAR_DEFAULT_SIZE
from seahub.avatar.templatetags.group_avatar_tags import api_grp_avatar_url from seahub.avatar.templatetags.group_avatar_tags import api_grp_avatar_url, \
get_default_group_avatar_url
from seahub.utils import is_org_context from seahub.utils import is_org_context
from seahub.utils.timeutils import dt, utc_to_local from seahub.utils.timeutils import dt, utc_to_local
from seahub.group.utils import validate_group_name, check_group_name_conflict from seahub.group.utils import validate_group_name, check_group_name_conflict
@ -69,8 +70,13 @@ class Groups(APIView):
groups = [] groups = []
for g in user_groups: for g in user_groups:
val = utc_to_local(dt(g.timestamp)) try:
avatar_url, is_default, date_uploaded = api_grp_avatar_url(g.id, size) avatar_url, is_default, date_uploaded = api_grp_avatar_url(g.id, size)
except Exception as e:
logger.error(e)
avatar_url = get_default_group_avatar_url()
val = utc_to_local(dt(g.timestamp))
group = { group = {
"id": g.id, "id": g.id,
"name": g.group_name, "name": g.group_name,
@ -145,9 +151,13 @@ class Groups(APIView):
size = GROUP_AVATAR_DEFAULT_SIZE size = GROUP_AVATAR_DEFAULT_SIZE
g = seaserv.get_group(group_id) g = seaserv.get_group(group_id)
val = utc_to_local(dt(g.timestamp)) try:
avatar_url, is_default, date_uploaded = api_grp_avatar_url(g.id, size) avatar_url, is_default, date_uploaded = api_grp_avatar_url(g.id, size)
except Exception as e:
logger.error(e)
avatar_url = get_default_group_avatar_url()
val = utc_to_local(dt(g.timestamp))
new_group = { new_group = {
"id": g.id, "id": g.id,
"name": g.group_name, "name": g.group_name,