[前台]修改小组逻辑,修正之前加入无需申请的小组的时候错误的提示,无需申请的小组取消申请列表栏

This commit is contained in:
esp
2015-09-03 20:25:09 +08:00
parent bfde3b976b
commit a16198b861
3 changed files with 15 additions and 4 deletions

View File

@@ -183,6 +183,8 @@ class JoinGroupAPIView(APIView):
else:
return error_response(u"你已经是小组成员了")
elif group.join_group_setting == 1:
if not data["message"]:
return error_response(u"message : 该字段是必填项。")
try:
JoinGroupRequest.objects.get(user=request.user, group=group, status=False)
return error_response(u"你已经提交过申请了,请等待审核")
@@ -295,6 +297,7 @@ def group_page(request, group_id):
return error_page(request, u"小组不存在")
return render(request, "oj/group/group.html", {"group": group})
@login_required
def application_list_page(request, group_id):
try:
@@ -305,6 +308,7 @@ def application_list_page(request, group_id):
return render(request, "oj/group/my_application_list.html",
{"group": group, "applications": applications})
@login_required
def application_page(request, request_id):
try:
@@ -312,4 +316,4 @@ def application_page(request, request_id):
except JoinGroupRequest.DoesNotExist:
return error_page(request, u"申请不存在")
return render(request, "oj/group/my_application.html",
{"application": application})
{"application": application})