From b1d191eda95d2c99169a10f23b24039a3bb06ea7 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Thu, 31 Mar 2016 23:42:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=90=8E=E5=8F=B0admin?=
 =?UTF-8?q?=E5=AF=B9=E6=97=B6=E9=97=B4=E5=92=8C=E5=86=85=E5=AD=98=E8=AE=BE?=
 =?UTF-8?q?=E5=AE=9A=E7=9A=84=E6=8F=90=E7=A4=BA=E5=B9=B6=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?admin=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 problem/serizalizers.py                        |  4 ++--
 static/src/js/app/admin/contest/editProblem.js | 10 +++++++---
 static/src/js/app/admin/problem/addProblem.js  |  8 ++++++--
 static/src/js/app/admin/problem/editProblem.js |  8 ++++++--
 template/src/admin/contest/edit_problem.html   | 12 ++++++------
 template/src/admin/problem/add_problem.html    | 16 ++++++++--------
 template/src/admin/problem/edit_problem.html   | 14 +++++++-------
 7 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/problem/serizalizers.py b/problem/serizalizers.py
index b29c0d3..1b0e955 100644
--- a/problem/serizalizers.py
+++ b/problem/serizalizers.py
@@ -25,8 +25,8 @@ class CreateProblemSerializer(serializers.Serializer):
     # [{"input": "1 1", "output": "2"}]
     samples = ProblemSampleSerializer()
     test_case_id = serializers.CharField(max_length=40)
-    time_limit = serializers.IntegerField(min_value=1)
-    memory_limit = serializers.IntegerField(min_value=1)
+    time_limit = serializers.IntegerField(min_value=1, max_value=10000)
+    memory_limit = serializers.IntegerField(min_value=16)
     difficulty = serializers.IntegerField()
     tags = serializers.ListField(child=serializers.CharField(max_length=10))
     hint = serializers.CharField(max_length=3000, allow_blank=True)
diff --git a/static/src/js/app/admin/contest/editProblem.js b/static/src/js/app/admin/contest/editProblem.js
index c19a26b..d2d2bbe 100644
--- a/static/src/js/app/admin/contest/editProblem.js
+++ b/static/src/js/app/admin/contest/editProblem.js
@@ -16,8 +16,12 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert",
                             bsAlert("题目描述不能为空!");
                             return false;
                         }
-                        if (vm.timeLimit < 30 || vm.timeLimit > 5000) {
-                            bsAlert("保证时间限制是一个30-5000的合法整数");
+                        if (vm.timeLimit < 1 || vm.timeLimit > 10000) {
+                            bsAlert("保证时间限制是一个1-10000的整数");
+                            return false;
+                        }
+                        if (vm.memoryLimit < 16) {
+                            bsAlert("最低内存不能低于16M(注意:Java最低需要内存32M)");
                             return false;
                         }
                         if (vm.samples.length == 0) {
@@ -91,7 +95,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert",
                     description: "",
                     timeLimit: 1000,
                     memoryLimit: 128,
-                    samples: [],
+                    samples: [{input: "", output: "", "visible": true}],
                     hint: "",
                     sortIndex: "",
                     visible: true,
diff --git a/static/src/js/app/admin/problem/addProblem.js b/static/src/js/app/admin/problem/addProblem.js
index 73254af..0e8605e 100644
--- a/static/src/js/app/admin/problem/addProblem.js
+++ b/static/src/js/app/admin/problem/addProblem.js
@@ -14,8 +14,12 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert",
                             bsAlert("题目描述不能为空!");
                             return false;
                         }
-                        if (vm.timeLimit < 30 || vm.timeLimit > 5000) {
-                            bsAlert("保证时间限制是一个30-5000的合法整数");
+                        if (vm.timeLimit < 1 || vm.timeLimit > 10000) {
+                            bsAlert("保证时间限制是一个1-10000的整数");
+                            return false;
+                        }
+                        if (vm.memoryLimit < 16) {
+                            bsAlert("最低内存不能低于16M(注意:Java最低需要内存32M)");
                             return false;
                         }
                         if (vm.samples.length == 0) {
diff --git a/static/src/js/app/admin/problem/editProblem.js b/static/src/js/app/admin/problem/editProblem.js
index b144864..a866634 100644
--- a/static/src/js/app/admin/problem/editProblem.js
+++ b/static/src/js/app/admin/problem/editProblem.js
@@ -15,8 +15,12 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert",
                             bsAlert("题目描述不能为空!");
                             return false;
                         }
-                        if (vm.timeLimit < 100 || vm.timeLimit > 5000) {
-                            bsAlert("保证时间限制是一个100-5000的合法整数");
+                        if (vm.timeLimit < 1 || vm.timeLimit > 10000) {
+                            bsAlert("保证时间限制是一个1-10000的整数");
+                            return false;
+                        }
+                        if (vm.memoryLimit < 16) {
+                            bsAlert("最低内存不能低于16M(注意:Java最低需要内存32M)");
                             return false;
                         }
                         if (vm.samples.length == 0) {
diff --git a/template/src/admin/contest/edit_problem.html b/template/src/admin/contest/edit_problem.html
index 14bbd6b..a928949 100644
--- a/template/src/admin/contest/edit_problem.html
+++ b/template/src/admin/contest/edit_problem.html
@@ -26,17 +26,17 @@
         </div>
 
 
-        <div class="col-md-3">
-            <div class="form-group"><label>时间限制(ms)</label>
+        <div class="col-md-6">
+            <div class="form-group"><label>时间限制(ms, 范围1-10000ms)</label>
                 <input type="number" name="timeLimit" class="form-control" ms-duplex="timeLimit"
-                       data-error="请输入时间限制(保证是一个30-5000的合法整数)" required>
+                       data-error="请输入时间限制" required>
                 <div class="help-block with-errors"></div>
             </div>
         </div>
-        <div class="col-md-3">
-            <div class="form-group"><label>内存限制(MB)</label>
+        <div class="col-md-6">
+            <div class="form-group"><label>请输入内存限制(MB, 最低16M, Java不能低于32M)</label>
                 <input type="number" name="memory" class="form-control" ms-duplex="memoryLimit"
-                       data-error="请输入内存限制(保证是一个合法整数)" required>
+                       data-error="请输入内存限制" required>
                 <div class="help-block with-errors"></div>
             </div>
         </div>
diff --git a/template/src/admin/problem/add_problem.html b/template/src/admin/problem/add_problem.html
index 6d96a7b..971300e 100644
--- a/template/src/admin/problem/add_problem.html
+++ b/template/src/admin/problem/add_problem.html
@@ -14,17 +14,17 @@
         </div>
 
 
-        <div class="col-md-3">
-            <div class="form-group"><label>时间限制(ms)</label>
+        <div class="col-md-6">
+            <div class="form-group"><label>时间限制(ms, 范围1-10000ms)</label>
                 <input type="number" name="timeLimit" class="form-control" ms-duplex="timeLimit"
-                       data-error="请输入时间限制(保证是一个100-5000的合法整数)" required>
+                       data-error="请输入时间限制" required>
                 <div class="help-block with-errors"></div>
             </div>
         </div>
-        <div class="col-md-3">
-            <div class="form-group"><label>内存限制(MB)</label>
+        <div class="col-md-6">
+            <div class="form-group"><label>内存限制(MB, 最低16M, Java不能低于32M)</label>
                 <input type="number" name="memoryLimit" class="form-control" ms-duplex="memoryLimit"
-                       data-error="请输入内存限制(保证是一个合法整数)" required>
+                       data-error="请输入内存限制(Java不能低于32M)" required>
                 <div class="help-block with-errors"></div>
             </div>
         </div>
@@ -45,8 +45,8 @@
                 <small> 可见</small>
             </label>
         </div>
-        <div id="tag" class="col-md-12">
-            <label>标签</label><br>
+        <div id="tag" class="col-md-6">
+            <label>标签(按回车创建)</label><br>
             <input type="text" id="tags">
         </div>
         <div class="col-md-12 form-group">
diff --git a/template/src/admin/problem/edit_problem.html b/template/src/admin/problem/edit_problem.html
index f9af36b..7b5295c 100644
--- a/template/src/admin/problem/edit_problem.html
+++ b/template/src/admin/problem/edit_problem.html
@@ -20,17 +20,17 @@
         </div>
 
 
-        <div class="col-md-3">
-            <div class="form-group"><label>时间限制(ms)</label>
+        <div class="col-md-6">
+            <div class="form-group"><label>时间限制(ms, 范围1-10000ms)</label>
                 <input type="number" name="timeLimit" class="form-control" ms-duplex="timeLimit"
-                       data-error="请输入时间限制(保证是一个100-5000的合法整数)" required>
+                       data-error="请输入时间限制" required>
                 <div class="help-block with-errors"></div>
             </div>
         </div>
-        <div class="col-md-3">
-            <div class="form-group"><label>内存限制(MB)</label>
+        <div class="col-md-6">
+            <div class="form-group"><label>内存限制(MB, 最低16M, Java不能低于32M)</label>
                 <input type="number" name="memory" class="form-control" ms-duplex="memoryLimit"
-                       data-error="请输入内存限制(保证是一个合法整数)" required>
+                       data-error="请输入内存限制" required>
                 <div class="help-block with-errors"></div>
             </div>
         </div>
@@ -51,7 +51,7 @@
                 <small> 可见</small>
             </label>
         </div>
-        <div id="tag" class="col-md-12">
+        <div id="tag" class="col-md-6">
             <label>标签</label><br>
             <input type="text" id="tags">
         </div>