Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
pyshx committed Oct 30, 2023
1 parent 211b55e commit 380f7dc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions server/pkg/plugin/manifest/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,12 @@ func (i PropertySchemaGroup) schemaGroup(tg *TranslatedPropertySchemaGroup) (*pr
title = title.WithDefault(i.Title)

var collection i18n.String
if tg != nil {
if tg != nil && tg.Collection != nil {
collection = tg.Collection.Clone()
}
collection = collection.WithDefault(*i.Collection)
if i.Collection != nil {
collection = collection.WithDefault(*i.Collection)
}

var representativeField *property.FieldID
if i.RepresentativeField != nil {
Expand Down
2 changes: 1 addition & 1 deletion server/pkg/plugin/manifest/schema_gen.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package manifest

// generated by "/var/folders/rm/rg5tw72s00bg6vlfw3jg7tm40000gn/T/go-build1900402475/b001/exe/schematyper -o schema_gen.go --package manifest ../../../schemas/plugin_manifest.json" -- DO NOT EDIT
// generated by "/var/folders/rm/rg5tw72s00bg6vlfw3jg7tm40000gn/T/go-build3463142305/b001/exe/schematyper -o schema_gen.go --package manifest ../../../schemas/plugin_manifest.json" -- DO NOT EDIT

type Choice struct {
Icon string `json:"icon,omitempty"`
Expand Down

0 comments on commit 380f7dc

Please sign in to comment.