QingdaoU/OnlineJudge
1
0
Fork 0
mirror of https://github.com/QingdaoU/OnlineJudge.git synced 2024-09-21 08:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into virusdefender-dev

Browse Source 
* 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:
virusdefender 2015-08-17 13:01:43 +08:00
commit 07349ba6e2
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
oj/local_settings.py
View File

@ -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']

6
static/src/js/app/admin/problem/add_problem.js
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: "请输入内存限制"
@ -215,4 +215,4 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
}); });
}); });
avalon.scan(); avalon.scan();
}); });

8
template/admin/problem/add_problem.html
View File

@ -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">