From 5b7aacc6ace4808a6836df81c392570edcd227c1 Mon Sep 17 00:00:00 2001 From: virusdefender Date: Thu, 26 Jan 2017 17:06:24 +0800 Subject: [PATCH] allow empty password --- account/serializers.py | 2 +- announcement/serializers.py | 1 - contest/serializers.py | 4 ++-- contest/views/admin.py | 6 +++--- judge/languages.py | 4 ++-- problem/views/admin.py | 1 + 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/account/serializers.py b/account/serializers.py index 04d2a8e3..62863255 100644 --- a/account/serializers.py +++ b/account/serializers.py @@ -36,7 +36,7 @@ class EditUserSerializer(serializers.Serializer): id = serializers.IntegerField() username = serializers.CharField(max_length=30) real_name = serializers.CharField(max_length=30) - password = serializers.CharField(max_length=30, min_length=6, required=False, default=None) + password = serializers.CharField(max_length=30, min_length=6, allow_blank=True, required=False, default=None) email = serializers.EmailField(max_length=254) admin_type = serializers.ChoiceField(choices=(AdminType.REGULAR_USER, AdminType.ADMIN, AdminType.SUPER_ADMIN)) open_api = serializers.BooleanField() diff --git a/announcement/serializers.py b/announcement/serializers.py index eab1e741..0c0beccc 100644 --- a/announcement/serializers.py +++ b/announcement/serializers.py @@ -1,4 +1,3 @@ -from account.models import User from utils.api import serializers from utils.api._serializers import DateTimeTZField, UsernameSerializer diff --git a/contest/serializers.py b/contest/serializers.py index c1dc13e4..d5bbb936 100644 --- a/contest/serializers.py +++ b/contest/serializers.py @@ -1,6 +1,6 @@ -from utils.api import serializers, DateTimeTZField, UsernameSerializer +from utils.api import DateTimeTZField, UsernameSerializer, serializers -from .models import ContestRuleType, Contest +from .models import Contest, ContestRuleType class CreateConetestSeriaizer(serializers.Serializer): diff --git a/contest/views/admin.py b/contest/views/admin.py index bbb930d2..932a164e 100644 --- a/contest/views/admin.py +++ b/contest/views/admin.py @@ -1,9 +1,9 @@ import dateutil.parser + from utils.api import APIView, validate_serializer -from django.utils import timezone -from account.models import AdminType -from ..serializers import CreateConetestSeriaizer, ContestSerializer + from ..models import Contest +from ..serializers import ContestSerializer, CreateConetestSeriaizer class ContestAPI(APIView): diff --git a/judge/languages.py b/judge/languages.py index e21179a9..5e186735 100644 --- a/judge/languages.py +++ b/judge/languages.py @@ -82,8 +82,8 @@ languages = [ {"config": _c_lang_config, "spj": {"compile": _c_lang_spj_compile, "config": _c_lang_spj_config}, "name": "C", "description": "GCC 4.8"}, {"config": _cpp_lang_config, "name": "C++", "description": "G++ 4.8"}, - {"config": _java_lang_config, "description": "OpenJDK 1.7"}, - {"config": _py2_lang_config, "description": "Python 2.7"} + {"config": _java_lang_config, "name": "Java", "description": "OpenJDK 1.7"}, + {"config": _py2_lang_config, "name": "Python2", "description": "Python 2.7"} ] spj_languages = list(filter(lambda item: "spj" in item, languages)) diff --git a/problem/views/admin.py b/problem/views/admin.py index 859fde76..455210e1 100644 --- a/problem/views/admin.py +++ b/problem/views/admin.py @@ -8,6 +8,7 @@ from django.conf import settings from account.decorators import admin_required from utils.api import CSRFExemptAPIView from utils.shortcuts import rand_str + from ..serializers import TestCaseUploadForm