Accept Merge Request #90 : (dev-sxw -> dev)

Merge Request: 关于添加问题功能的修改
Created By: @esp
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/90
This commit is contained in:
virusdefender
2015-08-17 12:59:52 +08:00
3 changed files with 8 additions and 8 deletions

View File

@@ -27,4 +27,4 @@ MONGODB = {
DEBUG = True DEBUG = True
# 同理 这是 web 服务器的上传路径 # 同理 这是 web 服务器的上传路径
TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case') TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case/')

View File

@@ -18,7 +18,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
} }
} }
}, },
cpu: { timeLimit: {
validators: { validators: {
notEmpty: { notEmpty: {
message: "请输入时间限制" message: "请输入时间限制"
@@ -34,7 +34,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
} }
} }
}, },
memory: { memoryLimit: {
validators: { validators: {
notEmpty: { notEmpty: {
message: "请输入内存限制" message: "请输入内存限制"
@@ -156,8 +156,8 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
$id: "addProblem", $id: "addProblem",
title: "", title: "",
description: "", description: "",
cpu: 1000, timeLimit: 1000,
memory: 256, memoryLimit: 256,
samples: [{input: "", output: "", "visible": true}], samples: [{input: "", output: "", "visible": true}],
hint: "", hint: "",
visible: true, visible: true,
@@ -215,4 +215,4 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
}); });
}); });
avalon.scan(); avalon.scan();
}); });

View File

@@ -15,12 +15,12 @@
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"><label>时间限制(ms)</label> <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> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"><label>内存限制(MB)</label> <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> </div>
<div class="col-md-3"> <div class="col-md-3">