合并dev,添加管理员在前台可见比赛所有提交详情,修改措辞,修改提示形式,以便于提交列表筛选功能的使用

problem/serizalizers.py

@@ -26,8 +26,8 @@ class CreateProblemSerializer(serializers.Serializer):
     samples = ProblemSampleSerializer()
     test_case_id = serializers.CharField(max_length=40)
     source = serializers.CharField(max_length=30, required=False, default=None)
-    time_limit = serializers.IntegerField()
-    memory_limit = serializers.IntegerField()
+    time_limit = serializers.IntegerField(min_value=1)
+    memory_limit = serializers.IntegerField(min_value=1)
     difficulty = serializers.IntegerField()
     tags = serializers.ListField(child=serializers.CharField(max_length=10))
     hint = serializers.CharField(max_length=3000, allow_blank=True)
@@ -61,8 +61,8 @@ class EditProblemSerializer(serializers.Serializer):
     output_description = serializers.CharField(max_length=10000)
     test_case_id = serializers.CharField(max_length=40)
     source = serializers.CharField(max_length=30)
-    time_limit = serializers.IntegerField()
-    memory_limit = serializers.IntegerField()
+    time_limit = serializers.IntegerField(min_value=1)
+    memory_limit = serializers.IntegerField(min_value=1)
     difficulty = serializers.IntegerField()
     tags = serializers.ListField(child=serializers.CharField(max_length=20))
     samples = ProblemSampleSerializer()

problem/tests.py

@@ -187,5 +187,19 @@ class ProblemListPageTest(TestCase):
                                               hint="hint1",
                                               created_by=User.objects.get(username="test"))
 
+    def test_problemListPage_not_exist(self):
+        response = self.client.get('/problems/999/')
+        self.assertTemplateUsed(response, "utils/error.html")
 
+    def test_query_by_keyword(self):
+        response = self.client.get(self.url + "?keyword=title1")
+        self.assertEqual(response.status_code, 200)
+
+    def test_query_by_tag_successfully(self):
+        response = self.client.get(self.url + "?tag=")
+        self.assertEqual(response.status_code, 200)
+
+    def test_tag_does_not_exists(self):
+        response = self.client.get(self.url + "?tag=xxxxxx")
+        self.assertTemplateUsed(response, "utils/error.html")