修复若干bug,优化若干代码
This commit is contained in:
+11
-7
@@ -1,14 +1,15 @@
|
||||
from django.db import models
|
||||
from django.core.validators import MaxValueValidator, MinValueValidator
|
||||
from datetime import datetime
|
||||
|
||||
from utils.ImageStorage import ImageStorage
|
||||
|
||||
class Department(models.Model):
|
||||
id = models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='部门ID')
|
||||
id = models.BigAutoField(auto_created=True, primary_key=True, verbose_name='部门ID')
|
||||
# did = models.IntegerField("部门ID")
|
||||
department_cn = models.CharField("部门名称", max_length=10) # 如“程序部”
|
||||
department_en = models.CharField("部门英文名称", max_length=30) # 如“程序部”
|
||||
picture = models.ImageField(verbose_name="部门图标", default=0)
|
||||
icon = models.ImageField(verbose_name="部门图标", default=0,storage=ImageStorage())
|
||||
background = models.ImageField(verbose_name="部门图标", default=0, storage=ImageStorage())
|
||||
content = models.CharField("内容", max_length=800) # 如部门介绍/部门要求
|
||||
introduction = models.CharField("介绍", max_length=800) # 如部门介绍/部门要求
|
||||
status = models.SmallIntegerField("部门状态", choices=[(0, "解散"), (1, "健在")], default=1)
|
||||
@@ -25,7 +26,7 @@ class History(models.Model):
|
||||
# grade = models.IntegerField("年级")
|
||||
years = models.IntegerField("年份", default=int(datetime.now().strftime('%Y')), validators=[
|
||||
MaxValueValidator(2300),
|
||||
MinValueValidator(2010)
|
||||
MinValueValidator(2000)
|
||||
])
|
||||
# did = models.IntegerField("部门ID")
|
||||
# did = models.ForeignKey(Department, on_delete=models.DO_NOTHING(), related_name="history", verbose_name="部门id")
|
||||
@@ -37,14 +38,17 @@ class History(models.Model):
|
||||
verbose_name_plural = '历史表'
|
||||
|
||||
def __str__(self):
|
||||
return self.department
|
||||
return self.department.department_cn
|
||||
|
||||
|
||||
class Members(models.Model):
|
||||
# 默认id作为成员id
|
||||
avatar = models.ImageField("头像", upload_to="avatar", blank=True)
|
||||
avatar = models.ImageField("头像", upload_to="avatar", blank=True,default="default/user.jpg",storage=ImageStorage())
|
||||
# did = models.IntegerField("所属部门ID", default=0)
|
||||
grade = models.IntegerField("年级")
|
||||
years = models.IntegerField("加入社团年份", default=int(datetime.now().strftime('%Y')), validators=[
|
||||
MaxValueValidator(2300),
|
||||
MinValueValidator(2000)
|
||||
])
|
||||
name = models.CharField("成员姓名", max_length=10)
|
||||
motto = models.CharField("座右铭", max_length=30)
|
||||
# department_cn = models.CharField("所属部门", max_length=10)
|
||||
|
||||
Reference in New Issue
Block a user