修复传入参数问题

Author: Chise1

fast_tmp/admin/site.py

@@ -1,33 +1,49 @@
-from fast_tmp.models import Group, User
+from typing import Any, Dict
+
+from requests import Request
+from tortoise import Model
+
+from fast_tmp.models import Group, Permission, User
 from fast_tmp.site import ModelAdmin
+from fast_tmp.site.field import Password
 
 
 class UserAdmin(ModelAdmin):
     model = User
-    list_display = ("id", "username", "is_active")
-    inline = ("is_active",)
-    create_fields = ("username", "password", "groups", "permissions")
-    update_fields = ("groups", "permissions")
-    # create_fields = (User.username, User.password)
-    # update_fields = (User.password,)
-
-    # @classmethod
-    # def create_model(cls, data: dict, session: Session) -> Any:
-    #     user = super().create_model(data, session)
-    #     user.set_password(data["password"])
-    #     return user
-    #
-    # @classmethod
-    # def update_model(cls, model: User, data: dict, session: Session) -> Any:
-    #     super().update_model(model, data, session)
-    #     model.set_password(data["password"])
-    #     return model
+    list_display = ("name", "username", "is_active", "is_superuser", "is_staff")
+    inline = ("is_active", "is_superuser", "is_staff")
+    create_fields = (
+        "username",
+        "password",
+        "name",
+        "groups",
+        "permissions",
+        "is_active",
+        "is_superuser",
+        "is_staff",
+    )
+    update_fields = (
+        "username",
+        "password",
+        "name",
+        "groups",
+        "permissions",
+        "is_active",
+        "is_superuser",
+        "is_staff",
+    )
+    fields = {"password": Password}
 
 
 class GroupAdmin(ModelAdmin):
     model = Group
-    list_display = ("id", "name", "users", "permissions")
-    create_fields = ("name", "permissions")
-    update_fields = ("name", "permissions")
-    # create_fields = (Group.name, Group.users)
-    # update_fields = (Group.name, Group.users)
+    list_display = ("name", "users", "permissions")
+    create_fields = ("name", "users", "permissions")
+    update_fields = ("name", "users", "permissions")
+
+
+class PermissionAdmin(ModelAdmin):
+    model = Permission
+    list_display = ("label", "codename", "users", "groups")
+    create_fields = ("label", "codename", "users", "groups")
+    update_fields = ("label", "codename", "users", "groups")

fast_tmp/models.py

@@ -65,7 +65,9 @@ def __repr__(self):
 class User(Model):
     username = fields.CharField(max_length=128, unique=True)
     password = fields.CharField(max_length=255)
+    name = fields.CharField(max_length=128)
     is_active = fields.BooleanField(default=True)
+    is_staff = fields.BooleanField(default=False)  # todo 为true才可以访问后台
     is_superuser = fields.BooleanField(default=False)
     groups: fields.ManyToManyRelation["Group"]
     permissions: fields.ManyToManyRelation[Permission] = fields.ManyToManyField(
@@ -119,7 +121,7 @@ async def has_perms(self, codenames: Tuple[str, ...]) -> bool:
         return True
 
     def __str__(self):
-        return self.username
+        return self.name
 
 
 class Group(Model):

fast_tmp/site/__init__.py

@@ -132,6 +132,7 @@ def get_create_dialogation_button(self, request: Request):
                 body=Form(
                     name=f"新增{self.name}",
                     title=f"新增{self.name}",
+                    # fixme 你的field字段传实例了吗？
                     body=[(i.get_control(request)) for i in controls.values()],
                     api=f"post:{self.prefix}/create",
                 ),
@@ -326,12 +327,20 @@ def make_fields(self):
         s.extend(self.update_fields)
         s = set(s)
         for field in s:
-            if not self.fields.get(field):
+            field_ = self.fields.get(field)
+            if not field_:
                 field_type = self.model._meta.fields_map.get(field)
                 if not field_type:
                     logger.error(f"can not found field {field} in {self.model.__name__}")
                     continue
                 self.fields[field] = create_column(field, field_type, self._prefix)
+            else:
+                if callable(field_):
+                    field_type = self.model._meta.fields_map.get(field)
+                    if not field_type:
+                        logger.error(f"can not found field {field} in {self.model.__name__}")
+                        continue
+                    self.fields[field] = field_(name=field, field=field_type, prefix=self.prefix)
 
     def get_control_field(self, name: str) -> BaseAdminControl:
         ret = self.fields.get(name)

fast_tmp/site/field.py

@@ -0,0 +1,9 @@
+from typing import Any
+
+from fast_tmp.contrib.auth.hashers import make_password
+from fast_tmp.site.util import StrControl
+
+
+class Password(StrControl):
+    def amis_2_orm(self, value: Any) -> Any:
+        return make_password(value)

fast_tmp/site/util.py

@@ -80,9 +80,9 @@ async def set_value(self, request: Request, obj: Model, value: Any):
     async def get_value(self, request: Request, obj: Model) -> Any:
         return self.orm_2_amis(getattr(obj, self.name))
 
-    def __init__(self, name: str, _field: fields.Field, _prefix: str, **kwargs):
-        super().__init__(name, _prefix, **kwargs)
-        self._field = _field  # type: ignore
+    def __init__(self, name: str, field: fields.Field, prefix: str, **kwargs):
+        super().__init__(name, prefix, **kwargs)
+        self._field = field  # type: ignore
         self.name = name
         self.label = kwargs.get("label") or self.name
 

fast_tmp_cli/__init__.py

@@ -20,12 +20,15 @@
 @async_to_sync
 async def create_superuser(username: str, password: str):
     from tortoise import Tortoise
-    await Tortoise.init(config=settings.TORTOISE_ORM)
+    try:
+        await Tortoise.init(config=settings.TORTOISE_ORM)
+    except AttributeError as e:
+        raise ValueError("may not config FASTAPI_SETTINGS_MODULE or "+str(e))
     from fast_tmp.models import User
     if await User.filter(username=username).exists():
         print(f"{username} 已经存在了")
         exit(1)
-    user = User(username=username, is_superuser=True)
+    user = User(username=username, is_superuser=True,is_staff=True,name=username)
     user.set_password(password)
     await user.save()
     sys.stdout.write(f"创建{username}成功\n")

tests/test_example/test_example/settings.py

@@ -13,7 +13,6 @@
             "models": [
                 "test_example.models",
                 "fast_tmp.models",
-                # "aerich.models",
             ],  # 注册app.models
             "default_connection": "default",
         }