增加搜索小组的功能

This commit is contained in:
virusdefender
2015-08-09 19:13:48 +08:00
parent a9b9ae7f76
commit 06528d379a
2 changed files with 7 additions and 3 deletions

View File

@@ -17,7 +17,7 @@ class EditGroupSerializer(serializers.Serializer):
class JoinGroupRequestSerializer(serializers.Serializer): class JoinGroupRequestSerializer(serializers.Serializer):
group = serializers.IntegerField() group_id = serializers.IntegerField()
message = serializers.CharField(max_length=30) message = serializers.CharField(max_length=30)

View File

@@ -86,7 +86,7 @@ class JoinGroupAPIView(APIView):
if serializer.is_valid(): if serializer.is_valid():
data = serializer.data data = serializer.data
try: try:
group = Grouo.objects.get(id=data["group"]) group = Grouo.objects.get(id=data["group_id"])
except Group.DesoNotExist: except Group.DesoNotExist:
return error_response(u"小组不存在") return error_response(u"小组不存在")
if group.join_group_setting == 0: if group.join_group_setting == 0:
@@ -100,4 +100,8 @@ class JoinGroupAPIView(APIView):
return serializer_invalid_response(serializer) return serializer_invalid_response(serializer)
def get(self, request): def get(self, request):
pass keyword = request.GET.get("keyword", None)
if not keyword:
return error_response(u"参数错误")
groups = Group.objects.filter(name__contains=keyword, visible=True, join_group_setting__lte=2)
return paginate(request, groups, GroupSerializer)