some api fixes

sergeyglazyrindev · Nov 8, 2021 · ee1b606 · ee1b606
1 parent 40adefb
commit ee1b606
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/core/admin_page.go b/core/admin_page.go
@@ -174,7 +174,7 @@ type AdminPage struct {
 	NoPermissionToAddNew               bool
 	NoPermissionToEdit                 bool
 	PermissionName                     CustomPermission
-	PreloadData                        func(afo IAdminFilterObjects)                                                                `json:"-"`
+	EnhanceQuerySet                        func(afo IAdminFilterObjects)                                                                `json:"-"`
 	CustomizeQuerySet                  func(adminContext IAdminContext, afo IAdminFilterObjects, requestParams *AdminRequestParams) `json:"-"`
 }
 

diff --git a/core/form_field_options.go b/core/form_field_options.go
@@ -196,4 +196,8 @@ func init() {
 		WidgetType: "textarea",
 		ReadOnly:   true,
 	})
+	UadminFormCongirurableOptionInstance.AddFieldFormOptions(&FieldFormOptions{
+		Name:       "EmailFieldOptions",
+		WidgetType: "email",
+	})
 }
diff --git a/core/form_widget.go b/core/form_widget.go
@@ -129,6 +129,8 @@ func GetWidgetByWidgetType(widgetType string, fieldOptions IFieldFormOptions) IW
 		widget = &PasswordWidget{}
 	case "dynamic":
 		widget = &DynamicWidget{}
+	case "email":
+		widget = &EmailWidget{}
 	case "foreignkey":
 		widget = &ForeignKeyWidget{}
 		if fieldOptions != nil && fieldOptions.GetIsAutocomplete() {

diff --git a/core/gorm_persistence_storage.go b/core/gorm_persistence_storage.go
@@ -52,8 +52,8 @@ func NewGormAdminPage(parentPage *AdminPage, genModelI func() (interface{}, inte
 				UadminDatabase:        uadminDatabase,
 				GenerateModelI:        genModelI,
 			}
-			if adminPage.PreloadData != nil {
-				adminPage.PreloadData(ret)
+			if adminPage.EnhanceQuerySet != nil {
+				adminPage.EnhanceQuerySet(ret)
 			}
 			if adminRequestParams != nil && adminRequestParams.RequestURL != "" {
 				url1, _ := url.Parse(adminRequestParams.RequestURL)