Merge branch 'dev' into hohoTT-dev

This commit is contained in:
hohoTT
2015-08-21 18:19:01 +08:00
22 changed files with 4271 additions and 151 deletions

View File

@@ -36,7 +36,7 @@ class AnnouncementAdminAPIView(APIView):
if request.user.admin_type == SUPER_ADMIN:
groups = Group.objects.filter(id__in=data["groups"])
else:
groups = Group.objects.filter(id__in=data["groups"], admin=request.user)
groups = Group.objects.filter(id__in=data["groups"], created_by=request.user)
if not groups.count():
return error_response(u"至少选择一个小组")
else:
@@ -75,7 +75,7 @@ class AnnouncementAdminAPIView(APIView):
if request.user.admin_type == SUPER_ADMIN:
groups = Group.objects.filter(id__in=data["groups"])
else:
groups = Group.objects.filter(id__in=data["groups"], admin=request.user)
groups = Group.objects.filter(id__in=data["groups"], created_by=request.user)
if not groups.count():
return error_response(u"至少选择一个小组")
announcement.title = data["title"]