mirror of
https://github.com/QingdaoU/OnlineJudge.git
synced 2024-09-21 08:23:20 +00:00
Merge branch 'dev' into virusdefender-dev
* dev: ‰øƧ‰øÆÊîπ‰∫ÜÊ∑ªÂä†ÈóÆÈ¢òÈ°µÈù¢jsÂèòÈáèÂêç,Ê∑ªÂä†ÈóÆÈ¢òÂäüËÉΩÊ≠£Â∏∏[CI SKIP] ‰øÆÊîπ/oj/local_settings.py‰∏≠ÁöÑtest_case‰∏䉺†Ë∑ØÂæÑ,‰øƧçʵãËØïÁæãÂ≠òÂÇ®ÈîôËØØÁöÑbug Conflicts: oj/local_settings.py template/admin/problem/add_problem.html
This commit is contained in:
commit
07349ba6e2
@ -30,3 +30,4 @@ DEBUG = True
|
|||||||
TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case/')
|
TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case/')
|
||||||
|
|
||||||
DATABASE_ROUTERS = ['oj.db_router.DBRouter']
|
DATABASE_ROUTERS = ['oj.db_router.DBRouter']
|
||||||
|
|
||||||
|
@ -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: "请输入内存限制"
|
||||||
|
@ -15,12 +15,16 @@
|
|||||||
|
|
||||||
<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="timeLimit">
|
|
||||||
|
<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="memoryLimit">
|
|
||||||
|
|
||||||
|
<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">
|
||||||
|
Loading…
Reference in New Issue
Block a user