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

去除部分 magic number

Browse Source
This commit is contained in:
virusdefender
2015-09-21 11:16:30 +08:00
parent 43be94cce6
commit 041fd2cb60
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
contest/decorators.py
View File

@@ -3,12 +3,12 @@ from functools import wraps
from django.http import HttpResponse, HttpResponseRedirect from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import render from django.shortcuts import render
from django.utils.timezone import now
from utils.shortcuts import error_response, error_page from utils.shortcuts import error_response, error_page
from account.models import SUPER_ADMIN from account.models import SUPER_ADMIN
from .models import Contest from .models import (Contest, PASSWORD_PROTECTED_CONTEST, PUBLIC_CONTEST, GROUP_CONTEST,
CONTEST_ENDED, CONTEST_NOT_START, CONTEST_UNDERWAY)
def check_user_contest_permission(func): def check_user_contest_permission(func):
@@ -55,7 +55,7 @@ def check_user_contest_permission(func):
return func(*args, **kwargs) return func(*args, **kwargs)
# 有密码的公开赛 # 有密码的公开赛
if contest.contest_type == 2: if contest.contest_type == PASSWORD_PROTECTED_CONTEST:
# 没有输入过密码 # 没有输入过密码
if contest.id not in request.session.get("contests", []): if contest.id not in request.session.get("contests", []):
if request.is_ajax(): if request.is_ajax():
@@ -65,7 +65,7 @@ def check_user_contest_permission(func):
{"reason": "password_protect", "show_tab": False, "contest": contest}) {"reason": "password_protect", "show_tab": False, "contest": contest})
# 指定小组参加的 # 指定小组参加的
if contest.contest_type == 0: if contest.contest_type == GROUP_CONTEST:
if not contest.groups.filter(id__in=request.user.group_set.all()).exists(): if not contest.groups.filter(id__in=request.user.group_set.all()).exists():
if request.is_ajax(): if request.is_ajax():
return error_response(u"只有指定小组的可以参加这场比赛") return error_response(u"只有指定小组的可以参加这场比赛")
@@ -74,7 +74,7 @@ def check_user_contest_permission(func):
{"reason": "group_limited", "show_tab": False, "contest": contest}) {"reason": "group_limited", "show_tab": False, "contest": contest})
# 比赛没有开始 # 比赛没有开始
if contest.status == 1: if contest.status == CONTEST_NOT_START:
if request.is_ajax(): if request.is_ajax():
return error_response(u"比赛还没有开始") return error_response(u"比赛还没有开始")
else: else:

10
contest/models.py
View File

@@ -10,6 +10,10 @@ GROUP_CONTEST = 0
PUBLIC_CONTEST = 1 PUBLIC_CONTEST = 1
PASSWORD_PROTECTED_CONTEST = 2 PASSWORD_PROTECTED_CONTEST = 2
CONTEST_NOT_START = 1
CONTEST_ENDED = -1
CONTEST_UNDERWAY = 0
class Contest(models.Model): class Contest(models.Model):
title = models.CharField(max_length=40, unique=True) title = models.CharField(max_length=40, unique=True)
@@ -44,13 +48,13 @@ class Contest(models.Model):
def status(self): def status(self):
if self.start_time > now(): if self.start_time > now():
# 没有开始 返回1 # 没有开始 返回1
return 1 return CONTEST_NOT_START
elif self.end_time < now(): elif self.end_time < now():
# 已经结束 返回0 # 已经结束 返回0
return -1 return CONTEST_ENDED
else: else:
# 正在进行 返回0 # 正在进行 返回0
return 0 return CONTEST_UNDERWAY
class Meta: class Meta:
db_table = "contest" db_table = "contest"