Merge branch 'dev' into virusdefender-dev

* dev: 增加比赛倒计时的功能 Conflicts: contest/models.py
2015-09-22 13:10:07 +08:00
parent 0718b4c521 bf2416659f
commit 0e50f7fdc5
12 changed files with 842 additions and 19 deletions
--- a/contest/models.py
+++ b/contest/models.py
@@ -50,7 +50,7 @@ class Contest(models.Model):
            # 没有开始 返回1
            return CONTEST_NOT_START
        elif self.end_time < now():
-            # 已经结束 返回0
+            # 已经结束 返回-1
            return CONTEST_ENDED
        else:
            # 正在进行 返回0