Skip to content

Commit 9d75c2a

Browse files
Fix enums in generated admin schema code.
1 parent f154d42 commit 9d75c2a

File tree

5 files changed

+36
-10
lines changed

5 files changed

+36
-10
lines changed

ent/admin/handler.go

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ent/admin/schema.go

Lines changed: 13 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ent/admin/templates/schema.tmpl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
Optional bool
2020
Immutable bool
2121
Sensitive bool
22-
Enums []Enum
22+
Enums []string
2323
}
2424

2525

@@ -35,12 +35,9 @@
3535
Immutable: {{ $f.Immutable }},
3636
Sensitive: {{ $f.Sensitive }},
3737
{{- if len $f.Enums }}
38-
Enums: []Enum{
38+
Enums: []string{
3939
{{- range $e := $f.Enums }}
40-
{
41-
Label: "{{ $e.Label }}",
42-
Value: "{{ $e.Value }}",
43-
},
40+
"{{ $e.Value }}",
4441
{{- end }}
4542
},
4643
{{- else }}

ent/admin/types.go

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/ui/forms/admin_entity.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ func AdminEntity(r *ui.Request, entityType admin.EntityType, values url.Values)
9292
}
9393
for _, enum := range f.Enums {
9494
options = append(options, Choice{
95-
Label: enum.Label,
96-
Value: enum.Value,
95+
Label: enum,
96+
Value: enum,
9797
})
9898
}
9999
nodes = append(nodes, SelectList(OptionsParams{

0 commit comments

Comments
 (0)