From 34f084c962e54635ce832d5d95201955b9d90333 Mon Sep 17 00:00:00 2001 From: Ethan Date: Fri, 11 Oct 2024 11:28:22 +0800 Subject: [PATCH] fix media uriname;fix demo case view field --- example/admin/demo_case.go | 2 +- media/filechooser.go | 4 ++-- media/list.go | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/example/admin/demo_case.go b/example/admin/demo_case.go index 9f63ce07f..169255532 100644 --- a/example/admin/demo_case.go +++ b/example/admin/demo_case.go @@ -279,6 +279,6 @@ func generateSection(detailing *presets.DetailingBuilder, section, editField, la return detailing.Section(section).Label(label).Editing(editField). ViewComponentFunc(func(obj interface{}, field *presets.FieldContext, ctx *web.EventContext) h.HTMLComponent { p := obj.(*DemoCase) - return vx.VXReadonlyField().Value(h.JSONString(p.FieldData)).Label(editField) + return vx.VXReadonlyField().Value(h.JSONString(reflectutils.MustGet(p, editField))).Label(editField) }) } diff --git a/media/filechooser.go b/media/filechooser.go index 51b368216..512cec001 100644 --- a/media/filechooser.go +++ b/media/filechooser.go @@ -583,7 +583,7 @@ func (mb *Builder) mediaLibraryTopOperations(clickTabEvent, field, tab, typeVal, ) h.HTMLComponent { var ( msgr = i18n.MustGetModuleMessages(ctx.R, I18nMediaLibraryKey, Messages_en_US).(*Messages) - inMediaLibrary = strings.Contains(ctx.R.RequestURI, "/"+MediaLibraryURIName) + inMediaLibrary = strings.Contains(ctx.R.RequestURI, "/"+mb.mb.Info().URIName()) fileAccept string ) @@ -772,7 +772,7 @@ func mediaLibraryContent(mb *Builder, field string, ctx *web.EventContext, tab = cmp.Or(ctx.Param(paramTab), tabFiles) parentID = ctx.ParamAsInt(ParamParentID) msgr = i18n.MustGetModuleMessages(ctx.R, I18nMediaLibraryKey, Messages_en_US).(*Messages) - inMediaLibrary = strings.Contains(ctx.R.RequestURI, "/"+MediaLibraryURIName) + inMediaLibrary = strings.Contains(ctx.R.RequestURI, "/"+mb.mb.Info().URIName()) files []*media_library.MediaLibrary bc h.HTMLComponent hasFolders = false diff --git a/media/list.go b/media/list.go index 10f627b04..98c607f75 100644 --- a/media/list.go +++ b/media/list.go @@ -12,11 +12,10 @@ import ( const ( mediaLibraryListField = "media-library-list" - MediaLibraryURIName = "media-libraries" ) func configList(b *presets.Builder, mb *Builder) { - mm := b.Model(&media_library.MediaLibrary{}).Label("Media Library").MenuIcon("mdi-image").URIName(MediaLibraryURIName) + mm := b.Model(&media_library.MediaLibrary{}).Label("Media Library").MenuIcon("mdi-image") mb.mb = mm oldPageFunc := mm.Listing().GetPageFunc() mm.Listing().PageFunc(func(ctx *web.EventContext) (r web.PageResponse, err error) {