From f7f2a327ea21e99dd1a55f5f4cd272da4200b687 Mon Sep 17 00:00:00 2001 From: sxw Date: Sat, 5 Dec 2015 15:48:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=96=B0=E7=9A=84=E6=AF=94=E8=B5=9B?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=9C=89=E5=AF=86=E7=A0=81=E7=9A=84?= =?UTF-8?q?=E5=B0=8F=E7=BB=84=E8=B5=9B=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contest/views.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contest/views.py b/contest/views.py index 87378db5..be6630e5 100644 --- a/contest/views.py +++ b/contest/views.py @@ -23,7 +23,7 @@ from submission.models import Submission from problem.models import Problem from .models import (Contest, ContestProblem, CONTEST_ENDED, CONTEST_NOT_START, CONTEST_UNDERWAY, ContestRank) -from .models import GROUP_CONTEST, PUBLIC_CONTEST, PASSWORD_PROTECTED_CONTEST +from .models import GROUP_CONTEST, PUBLIC_CONTEST, PASSWORD_PROTECTED_CONTEST, PASSWORD_PROTECTED_GROUP_CONTEST from .decorators import check_user_contest_permission from .serializers import (CreateContestSerializer, ContestSerializer, EditContestSerializer, CreateContestProblemSerializer, ContestProblemSerializer, @@ -50,11 +50,11 @@ class ContestAdminAPIView(APIView): if request.user.admin_type != SUPER_ADMIN: return error_response(u"只有超级管理员才可创建公开赛") - if data["contest_type"] == PASSWORD_PROTECTED_CONTEST: + if data["contest_type"] in [PASSWORD_PROTECTED_CONTEST, PASSWORD_PROTECTED_GROUP_CONTEST]: if not data["password"]: - return error_response(u"此比赛为有密码的公开赛，密码不可为空") + return error_response(u"此比赛为有密码的比赛，密码不可为空") # 没有密码的公开赛 没有密码的小组赛 - elif data["contest_type"] == GROUP_CONTEST: + if data["contest_type"] == GROUP_CONTEST or data["contest_type"] == PASSWORD_PROTECTED_GROUP_CONTEST: if request.user.admin_type == SUPER_ADMIN: groups = Group.objects.filter(id__in=data["groups"]) else: @@ -107,7 +107,7 @@ class ContestAdminAPIView(APIView): if data["contest_type"] == PASSWORD_PROTECTED_CONTEST: if not data["password"]: return error_response(u"此比赛为有密码的公开赛，密码不可为空") - elif data["contest_type"] == GROUP_CONTEST: + elif data["contest_type"] == GROUP_CONTEST or data["contest_type"] == PASSWORD_PROTECTED_GROUP_CONTEST: if request.user.admin_type == SUPER_ADMIN: groups = Group.objects.filter(id__in=data["groups"]) else: