diff --git a/ent/admin/handler.go b/ent/admin/handler.go index 938de63..bb74b15 100644 --- a/ent/admin/handler.go +++ b/ent/admin/handler.go @@ -199,9 +199,6 @@ func (h *Handler) UserCreate(ctx echo.Context) error { if payload.CreatedAt != nil { op.SetCreatedAt(*payload.CreatedAt) } - if payload.Role != nil { - op.SetRole(*payload.Role) - } _, err := op.Save(ctx.Request().Context()) return err } @@ -225,12 +222,6 @@ func (h *Handler) UserUpdate(ctx echo.Context, id int) error { } op.SetVerified(payload.Verified) op.SetAdmin(payload.Admin) - if payload.Role == nil { - var empty user.Role - op.SetRole(empty) - } else { - op.SetRole(*payload.Role) - } _, err = op.Save(ctx.Request().Context()) return err } @@ -260,7 +251,6 @@ func (h *Handler) UserList(ctx echo.Context) (*EntityList, error) { "Verified", "Admin", "Created at", - "Role", }, Entities: make([]EntityValues, 0, len(res)), Page: page, @@ -276,7 +266,6 @@ func (h *Handler) UserList(ctx echo.Context) (*EntityList, error) { fmt.Sprint(res[i].Verified), fmt.Sprint(res[i].Admin), res[i].CreatedAt.Format(h.Config.TimeFormat), - fmt.Sprint(res[i].Role), }, }) } @@ -295,7 +284,6 @@ func (h *Handler) UserGet(ctx echo.Context, id int) (url.Values, error) { v.Set("email", entity.Email) v.Set("verified", fmt.Sprint(entity.Verified)) v.Set("admin", fmt.Sprint(entity.Admin)) - v.Set("role", fmt.Sprint(entity.Role)) return v, err } diff --git a/ent/admin/schema.go b/ent/admin/schema.go index f7a207c..8657b4c 100644 --- a/ent/admin/schema.go +++ b/ent/admin/schema.go @@ -98,16 +98,4 @@ var fieldsUser = []*FieldSchema{ Sensitive: false, Enums: nil, }, - { - Name: "role", - Type: field.TypeEnum, - Optional: false, - Immutable: false, - Sensitive: false, - Enums: []string{ - "read", - "write", - "admin", - }, - }, } diff --git a/ent/admin/types.go b/ent/admin/types.go index aa19236..54f3a52 100644 --- a/ent/admin/types.go +++ b/ent/admin/types.go @@ -1,11 +1,7 @@ // Code generated by ent, DO NOT EDIT. package admin -import ( - "time" - - "github.com/mikestefanello/pagoda/ent/user" -) +import "time" type PasswordToken struct { Token *string `form:"token"` @@ -28,7 +24,6 @@ type User struct { Verified bool `form:"verified"` Admin bool `form:"admin"` CreatedAt *time.Time `form:"created_at"` - Role *user.Role `form:"role"` } func (e *User) GetName() string {