Merge branch 'dev-sxw' into virusdefender-dev

* dev-sxw:
  实现了比赛提交列表里封榜的行为,封榜以后只显示缓存里的提交数据和封榜后自己的提交,封榜以后rank不再刷新(rank里还不会显示自己封榜以后的提交。。。这好像不对呀)
  增加比赛提交页面封榜行为
  修改函数名称
  为User   problems_status 添加默认值,并精简了相关代码

Conflicts:
	contest/views.py
This commit is contained in:
virusdefender
2015-09-17 10:12:43 +08:00
7 changed files with 40 additions and 20 deletions

View File

@@ -283,7 +283,7 @@ def problem_list_page(request, page=1):
except Exception:
pass
if request.user.is_authenticated() and request.user.problems_status:
if request.user.is_authenticated():
problems_status = json.loads(request.user.problems_status)
else:
problems_status = {}