xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions 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
parent 309eef710c 8571a4199a
commit 07349ba6e2
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,12 +15,16 @@
<div class="col-md-3">
<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 class="col-md-3">
<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 class="col-md-3">