mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
feat: edit org display names and descriptions (#13474)
This commit is contained in:
@@ -46,25 +46,27 @@ func init() {
|
||||
valid := NameValid(str)
|
||||
return valid == nil
|
||||
}
|
||||
for _, tag := range []string{"username", "template_name", "workspace_name", "oauth2_app_name"} {
|
||||
for _, tag := range []string{"username", "organization_name", "template_name", "workspace_name", "oauth2_app_name"} {
|
||||
err := Validate.RegisterValidation(tag, nameValidator)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}
|
||||
|
||||
templateDisplayNameValidator := func(fl validator.FieldLevel) bool {
|
||||
displayNameValidator := func(fl validator.FieldLevel) bool {
|
||||
f := fl.Field().Interface()
|
||||
str, ok := f.(string)
|
||||
if !ok {
|
||||
return false
|
||||
}
|
||||
valid := TemplateDisplayNameValid(str)
|
||||
valid := DisplayNameValid(str)
|
||||
return valid == nil
|
||||
}
|
||||
err := Validate.RegisterValidation("template_display_name", templateDisplayNameValidator)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
for _, displayNameTag := range []string{"organization_display_name", "template_display_name"} {
|
||||
err := Validate.RegisterValidation(displayNameTag, displayNameValidator)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}
|
||||
|
||||
templateVersionNameValidator := func(fl validator.FieldLevel) bool {
|
||||
@@ -76,7 +78,7 @@ func init() {
|
||||
valid := TemplateVersionNameValid(str)
|
||||
return valid == nil
|
||||
}
|
||||
err = Validate.RegisterValidation("template_version_name", templateVersionNameValidator)
|
||||
err := Validate.RegisterValidation("template_version_name", templateVersionNameValidator)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
@@ -65,8 +65,8 @@ func TemplateVersionNameValid(str string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// TemplateDisplayNameValid returns whether the input string is a valid template display name.
|
||||
func TemplateDisplayNameValid(str string) error {
|
||||
// DisplayNameValid returns whether the input string is a valid template display name.
|
||||
func DisplayNameValid(str string) error {
|
||||
if len(str) == 0 {
|
||||
return nil // empty display_name is correct
|
||||
}
|
||||
|
||||
@@ -117,7 +117,7 @@ func TestTemplateDisplayNameValid(t *testing.T) {
|
||||
testCase := testCase
|
||||
t.Run(testCase.Name, func(t *testing.T) {
|
||||
t.Parallel()
|
||||
valid := httpapi.TemplateDisplayNameValid(testCase.Name)
|
||||
valid := httpapi.DisplayNameValid(testCase.Name)
|
||||
require.Equal(t, testCase.Valid, valid == nil)
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user