xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source 
* dev:
  修改 admin 界面，ip 太宽了
  jquery选择器参数字符串里多打了一个空格
  修复小组邀请赛的密码验证的问题，感觉之前测试过了呀，结果还是有问题，因为验证密码api里选择比赛时限定比赛类型中只有带密码的公开赛，所以无法验证带密码的小组赛

Conflicts:
	judge_dispatcher/tasks.py
	oj/settings.py
	static/src/js/build.js
	static/src/js/config.js
This commit is contained in:
virusdefender
2015-12-23 00:36:21 +08:00
parent c035971908 dfaa7655ad
commit 0483fa2496
18 changed files with 475 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
judge_dispatcher/tasks.py
View File

@@ -90,8 +90,8 @@ class JudgeDispatcher(object):
waiting_submission.delete()
_judge.delay(submission, time_limit=waiting_submission.time_limit,
memory_limit=waiting_submission.memory_limit, test_case_id=waiting_submission.test_case_id,
is_waiting_task=True)
memory_limit=waiting_submission.memory_limit,
test_case_id=waiting_submission.test_case_id, is_waiting_task=True)
def update_problem_status(self):
problem = Problem.objects.get(id=self.submission.problem_id)
@@ -119,7 +119,8 @@ class JudgeDispatcher(object):
logger.info("Contest debug mode, id: " + str(contest.id) + ", submission id: " + self.submission.id)
return
with transaction.atomic():
contest_problem = ContestProblem.objects.select_for_update().get(contest=contest, id=self.submission.problem_id)
contest_problem = ContestProblem.objects.select_for_update().get(contest=contest,
id=self.submission.problem_id)
contest_problem.add_submission_number()