add contest_type in contest models

Author: zdszero

contest/models.py

@@ -14,9 +14,8 @@
 class Contest(models.Model):
     title = models.TextField()
     description = RichTextField()
-    # show real time rank or cached rank
     password = models.TextField(null=True)
-    # enum of ContestRuleType
+    contest_type = models.TextField()
     start_time = models.DateTimeField(default=timezone.now())
     end_time = models.DateTimeField(null=True)
     create_time = models.DateTimeField(auto_now_add=True)
@@ -38,12 +37,6 @@ def status(self):
             # 正在进行 返回0
             return ContestStatus.CONTEST_UNDERWAY
 
-    @property
-    def contest_type(self):
-        if self.password:
-            return ContestType.PASSWORD_PROTECTED_CONTEST
-        return ContestType.PUBLIC_CONTEST
-
     def problem_details_permission(self, user):
         return True
 

contest/views/admin.py

@@ -13,7 +13,7 @@
 from submission.models import Submission, JudgeStatus
 from utils.api import APIView, validate_serializer
 from utils.cache import cache
-from utils.constants import CacheKey
+from utils.constants import CacheKey, ContestType
 from utils.shortcuts import rand_str
 from utils.tasks import delete_files
 from ..models import Contest, ContestAnnouncement
@@ -37,8 +37,11 @@ def post(self, request):
         # data["contest_admin"].append(str(request.user.id))
         if data["end_time"] <= data["start_time"]:
             return self.error("Start time must occur earlier than end time")
-        if data.get("password") and data["password"] == "":
+        if data["password"] == "":
             data["password"] = None
+            data["contest_type"] = ContestType.PUBLIC_CONTEST
+        else:
+            data["contest_type"] = ContestType.PASSWORD_PROTECTED_CONTEST
         for ip_range in data["allowed_ip_ranges"]:
             try:
                 ip_network(ip_range, strict=False)

options/options.py

@@ -207,7 +207,8 @@ def website_name_shortcut(cls, value):
 
     @my_property(ttl=DEFAULT_SHORT_TTL)
     def website_footer(cls):
-        return cls._get_option(OptionKeys.website_footer)
+        return ""
+        # return cls._get_option(OptionKeys.website_footer)
 
     @website_footer.setter
     def website_footer(cls, value):

problem/views/admin.py

@@ -51,7 +51,7 @@ def post(self, request):
         uploader = ZipFileUploader(request.FILES.get('file'), problem)
         valid = uploader.upload()
         if not valid:
-            return uploader.error_message
+            return self.error(uploader.error_message)
 
         # create inexist tags
         for item in tags: