Rename fastapi_admin.models.User to fastapi_admin.models.AbstractUser.

This commit is contained in:
long2ice
2020-07-02 11:46:12 +08:00
parent 4ea2c4bbab
commit 09525d363a
6 changed files with 12 additions and 8 deletions

View File

@ -5,6 +5,10 @@ ChangeLog
0.2 0.2
=== ===
0.2.9
-----
- Rename `fastapi_admin.models.User` to `fastapi_admin.models.AbstractUser`.
0.2.8 0.2.8
----- -----
- Add password auto hash. - Add password auto hash.

View File

@ -112,13 +112,13 @@ for reference.
### Builtin Auth And Permissions Control ### Builtin Auth And Permissions Control
Inherit `fastapi_admin.models.User` and add you own fields,must contains You should inherit `fastapi_admin.models.AbstractUser` and add you own fields,must contains
`is_active` and `is_superuser`. `is_active` and `is_superuser`.
```python ```python
from fastapi_admin.models import User as AdminUser from fastapi_admin.models import AbstractUser
class AdminUser(AdminUser,Model): class AdminUser(AbstractUser,Model):
is_active = fields.BooleanField(default=False, description='Is Active') is_active = fields.BooleanField(default=False, description='Is Active')
is_superuser = fields.BooleanField(default=False, description='Is Superuser') is_superuser = fields.BooleanField(default=False, description='Is Superuser')
status = fields.IntEnumField(Status, description='User Status') status = fields.IntEnumField(Status, description='User Status')

View File

@ -2,12 +2,12 @@ import datetime
from tortoise import Model, fields from tortoise import Model, fields
from fastapi_admin.models import User as AdminUser from fastapi_admin.models import AbstractUser
from .enums import ProductType, Status from .enums import ProductType, Status
class User(AdminUser): class User(AbstractUser):
last_login = fields.DatetimeField(description="Last Login", default=datetime.datetime.now) last_login = fields.DatetimeField(description="Last Login", default=datetime.datetime.now)
is_active = fields.BooleanField(default=True, description="Is Active") is_active = fields.BooleanField(default=True, description="Is Active")
is_superuser = fields.BooleanField(default=False, description="Is SuperUser") is_superuser = fields.BooleanField(default=False, description="Is SuperUser")

View File

@ -5,4 +5,4 @@ def version():
# with open("pyproject.toml") as f: # with open("pyproject.toml") as f:
# ret = re.findall(r'version = "(\d+\.\d+\.\d+)"', f.read()) # ret = re.findall(r'version = "(\d+\.\d+\.\d+)"', f.read())
# return ret[0] # return ret[0]
return "0.2.8" return "0.2.9"

View File

@ -3,7 +3,7 @@ from tortoise import Model, fields
from fastapi_admin import enums from fastapi_admin import enums
class User(Model): class AbstractUser(Model):
username = fields.CharField(max_length=20, unique=True) username = fields.CharField(max_length=20, unique=True)
password = fields.CharField(max_length=200, description="Will auto hash with raw password") password = fields.CharField(max_length=200, description="Will auto hash with raw password")

View File

@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "fastapi-admin" name = "fastapi-admin"
version = "0.2.8" version = "0.2.9"
description = "Fast Admin Dashboard based on fastapi and tortoise-orm and rest-admin." description = "Fast Admin Dashboard based on fastapi and tortoise-orm and rest-admin."
authors = ["long2ice <long2ice@gmail.com>"] authors = ["long2ice <long2ice@gmail.com>"]
license = "Apache-2.0" license = "Apache-2.0"