update to django 2.0

contest/models.py

@@ -20,7 +20,7 @@ class Contest(models.Model):
     end_time = models.DateTimeField()
     create_time = models.DateTimeField(auto_now_add=True)
     last_update_time = models.DateTimeField(auto_now=True)
-    created_by = models.ForeignKey(User)
+    created_by = models.ForeignKey(User, on_delete=models.CASCADE)
     # 是否可见 false的话相当于删除
     visible = models.BooleanField(default=True)
     allowed_ip_ranges = JSONField(default=list)
@@ -47,7 +47,7 @@ class Contest(models.Model):
     def problem_details_permission(self, user):
         return self.rule_type == ContestRuleType.ACM or \
                self.status == ContestStatus.CONTEST_ENDED or \
-               user.is_authenticated() and user.is_contest_admin(self) or \
+               user.is_authenticated and user.is_contest_admin(self) or \
                self.real_time_rank
 
     class Meta:
@@ -56,8 +56,8 @@ class Contest(models.Model):
 
 
 class AbstractContestRank(models.Model):
-    user = models.ForeignKey(User)
-    contest = models.ForeignKey(Contest)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    contest = models.ForeignKey(Contest, on_delete=models.CASCADE)
     submission_number = models.IntegerField(default=0)
 
     class Meta:
@@ -87,10 +87,10 @@ class OIContestRank(AbstractContestRank):
 
 
 class ContestAnnouncement(models.Model):
-    contest = models.ForeignKey(Contest)
+    contest = models.ForeignKey(Contest, on_delete=models.CASCADE)
     title = models.TextField()
     content = RichTextField()
-    created_by = models.ForeignKey(User)
+    created_by = models.ForeignKey(User, on_delete=models.CASCADE)
     visible = models.BooleanField(default=True)
     create_time = models.DateTimeField(auto_now_add=True)
 

contest/tests.py

@@ -45,7 +45,7 @@ class ContestAdminAPITest(APITestCase):
         response_data = response.data["data"]
         for k in data.keys():
             if isinstance(data[k], datetime):
-                    continue
+                continue
             self.assertEqual(response_data[k], data[k])
 
     def test_get_contests(self):

contest/views/oj.py

@@ -121,7 +121,7 @@ class ContestRankAPI(APIView):
     def get(self, request):
         download_csv = request.GET.get("download_csv")
         force_refresh = request.GET.get("force_refresh")
-        is_contest_admin = request.user.is_authenticated() and request.user.is_contest_admin(self.contest)
+        is_contest_admin = request.user.is_authenticated and request.user.is_contest_admin(self.contest)
         if self.contest.rule_type == ContestRuleType.OI:
             serializer = OIContestRankSerializer
         else: