From 322672770356b3ed0d3f725d229d6a9207069c45 Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Mon, 17 Aug 2015 09:46:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9/oj/local=5Fsettings.py?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84test=5Fcase=E4=B8=8A=E4=BC=A0=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84,=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E5=AD=98=E5=82=A8=E9=94=99=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oj/local_settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oj/local_settings.py b/oj/local_settings.py
index 2d84f67..3c87b06 100644
--- a/oj/local_settings.py
+++ b/oj/local_settings.py
@@ -27,4 +27,4 @@ MONGODB = {
 DEBUG = True
 
 # 同理 这是 web 服务器的上传路径
-TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case')
+TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case/')

From bc18c1125c3987da992cceb470a451a9ba19b905 Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Mon, 17 Aug 2015 10:19:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=E4=BF=AE=E6=94=B9=E4=BA=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=97=AE=E9=A2=98=E9=A1=B5=E9=9D=A2js?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=90=8D,=E6=B7=BB=E5=8A=A0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=8A=9F=E8=83=BD=E6=AD=A3=E5=B8=B8[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/app/admin/problem/add_problem.js | 10 +++++-----
 template/admin/problem/add_problem.html        |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/static/src/js/app/admin/problem/add_problem.js b/static/src/js/app/admin/problem/add_problem.js
index 40f74da..4996f85 100644
--- a/static/src/js/app/admin/problem/add_problem.js
+++ b/static/src/js/app/admin/problem/add_problem.js
@@ -18,7 +18,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
                                 }
                             }
                         },
-                        cpu: {
+                        timeLimit: {
                             validators: {
                                 notEmpty: {
                                     message: "请输入时间限制"
@@ -34,7 +34,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
                                 }
                             }
                         },
-                        memory: {
+                        memoryLimit: {
                             validators: {
                                 notEmpty: {
                                     message: "请输入内存限制"
@@ -156,8 +156,8 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
                 $id: "addProblem",
                 title: "",
                 description: "",
-                cpu: 1000,
-                memory: 256,
+                timeLimit: 1000,
+                memoryLimit: 256,
                 samples: [{input: "", output: "", "visible": true}],
                 hint: "",
                 visible: true,
@@ -215,4 +215,4 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
             });
         });
         avalon.scan();
-    });
\ No newline at end of file
+    });
diff --git a/template/admin/problem/add_problem.html b/template/admin/problem/add_problem.html
index 67e79cf..63132ca 100644
--- a/template/admin/problem/add_problem.html
+++ b/template/admin/problem/add_problem.html
@@ -15,12 +15,12 @@
 
         <div class="col-md-3">
             <div class="form-group"><label>时间限制(ms)</label>
-                <input type="number" name="cpu" class="form-control" ms-duplex="cpu">
+                <input type="number" name="timeLimit" class="form-control" ms-duplex="timeLimit">
             </div>
         </div>
         <div class="col-md-3">
             <div class="form-group"><label>内存限制(MB)</label>
-                <input type="number" name="memory" class="form-control" ms-duplex="memory">
+                <input type="number" name="memoryLimit" class="form-control" ms-duplex="memoryLimit">
             </div>
         </div>
         <div class="col-md-3">