mirror of
https://github.com/QingdaoU/OnlineJudge.git
synced 2024-09-21 16:33:22 +00:00
Merge branch 'virusdefender-dev' into debug
* virusdefender-dev: 修复 jsonField 中的问题
This commit is contained in:
commit
b32e015400
@ -2,7 +2,7 @@
|
|||||||
from django.db import models
|
from django.db import models
|
||||||
from django.contrib.auth.models import AbstractBaseUser
|
from django.contrib.auth.models import AbstractBaseUser
|
||||||
|
|
||||||
from utils.models import JsonField
|
from jsonfield import JSONField
|
||||||
|
|
||||||
|
|
||||||
class AdminGroup(models.Model):
|
class AdminGroup(models.Model):
|
||||||
@ -33,7 +33,7 @@ class User(AbstractBaseUser):
|
|||||||
# 0代表不是管理员 1是普通管理员 2是超级管理员
|
# 0代表不是管理员 1是普通管理员 2是超级管理员
|
||||||
admin_type = models.IntegerField(default=0)
|
admin_type = models.IntegerField(default=0)
|
||||||
# JSON字典用来表示该用户的问题的解决状态 1为ac,2为正在进行
|
# JSON字典用来表示该用户的问题的解决状态 1为ac,2为正在进行
|
||||||
problems_status = JsonField(default={})
|
problems_status = JSONField(default={})
|
||||||
# 找回密码用的token
|
# 找回密码用的token
|
||||||
# reset_password_token = models.CharField(max_length=40, blank=True, null=True)
|
# reset_password_token = models.CharField(max_length=40, blank=True, null=True)
|
||||||
|
|
||||||
|
@ -5,7 +5,8 @@ from django.utils.timezone import now
|
|||||||
from account.models import User
|
from account.models import User
|
||||||
from problem.models import AbstractProblem
|
from problem.models import AbstractProblem
|
||||||
from group.models import Group
|
from group.models import Group
|
||||||
from utils.models import RichTextField, JsonField
|
from utils.models import RichTextField
|
||||||
|
from jsonfield import JSONField
|
||||||
from judge.judger.result import result
|
from judge.judger.result import result
|
||||||
|
|
||||||
|
|
||||||
@ -117,7 +118,7 @@ class ContestRank(models.Model):
|
|||||||
total_time = models.IntegerField(default=0)
|
total_time = models.IntegerField(default=0)
|
||||||
# 数据结构{23: {"is_ac": True, "ac_time": 8999, "error_number": 2, "is_first_ac": True}}
|
# 数据结构{23: {"is_ac": True, "ac_time": 8999, "error_number": 2, "is_first_ac": True}}
|
||||||
# key 是比赛题目的id
|
# key 是比赛题目的id
|
||||||
submission_info = JsonField(default={})
|
submission_info = JSONField(default={})
|
||||||
|
|
||||||
def update_rank(self, submission):
|
def update_rank(self, submission):
|
||||||
if not submission.contest_id or submission.contest_id != self.contest_id:
|
if not submission.contest_id or submission.contest_id != self.contest_id:
|
||||||
|
@ -9,4 +9,5 @@ gunicorn
|
|||||||
coverage
|
coverage
|
||||||
django-extensions
|
django-extensions
|
||||||
supervisor
|
supervisor
|
||||||
pillow
|
pillow
|
||||||
|
jsonfield
|
Loading…
Reference in New Issue
Block a user