diff --git a/assets/js/components/Config/PropertyField.vue b/assets/js/components/Config/PropertyField.vue index 49f25726e..77dd2ca64 100644 --- a/assets/js/components/Config/PropertyField.vue +++ b/assets/js/components/Config/PropertyField.vue @@ -168,7 +168,7 @@ export default { return this.type === "Bool"; }, array() { - return this.type === "StringList"; + return this.type === "List"; }, select() { return this.validValues.length > 0; diff --git a/assets/js/components/Config/VehicleModal.vue b/assets/js/components/Config/VehicleModal.vue index 780d5ee64..762821544 100644 --- a/assets/js/components/Config/VehicleModal.vue +++ b/assets/js/components/Config/VehicleModal.vue @@ -193,7 +193,7 @@ = ParamType(len(_ParamTypeIndex)-1) { @@ -31,10 +31,10 @@ func _ParamTypeNoOp() { _ = x[TypeDuration-(4)] _ = x[TypeFloat-(5)] _ = x[TypeInt-(6)] - _ = x[TypeStringList-(7)] + _ = x[TypeList-(7)] } -var _ParamTypeValues = []ParamType{TypeString, TypeBool, TypeChoice, TypeChargeModes, TypeDuration, TypeFloat, TypeInt, TypeStringList} +var _ParamTypeValues = []ParamType{TypeString, TypeBool, TypeChoice, TypeChargeModes, TypeDuration, TypeFloat, TypeInt, TypeList} var _ParamTypeNameToValueMap = map[string]ParamType{ _ParamTypeName[0:6]: TypeString, @@ -51,8 +51,8 @@ var _ParamTypeNameToValueMap = map[string]ParamType{ _ParamTypeLowerName[35:40]: TypeFloat, _ParamTypeName[40:43]: TypeInt, _ParamTypeLowerName[40:43]: TypeInt, - _ParamTypeName[43:53]: TypeStringList, - _ParamTypeLowerName[43:53]: TypeStringList, + _ParamTypeName[43:47]: TypeList, + _ParamTypeLowerName[43:47]: TypeList, } var _ParamTypeNames = []string{ @@ -63,7 +63,7 @@ var _ParamTypeNames = []string{ _ParamTypeName[27:35], _ParamTypeName[35:40], _ParamTypeName[40:43], - _ParamTypeName[43:53], + _ParamTypeName[43:47], } // ParamTypeString retrieves an enum value from the enum constants string name. diff --git a/util/templates/template.go b/util/templates/template.go index 649d0e711..f5fdb61ce 100644 --- a/util/templates/template.go +++ b/util/templates/template.go @@ -221,7 +221,7 @@ func (t *Template) RenderProxyWithValues(values map[string]interface{}, lang str } switch p.Type { - case TypeStringList: + case TypeList: for _, e := range v.([]string) { t.Params[index].Values = append(p.Values, yamlQuote(e)) } @@ -240,7 +240,7 @@ func (t *Template) RenderProxyWithValues(values map[string]interface{}, lang str for _, param := range t.Params { if !param.IsRequired() { switch param.Type { - case TypeStringList: + case TypeList: if len(param.Values) == 0 { continue } diff --git a/util/templates/types.go b/util/templates/types.go index a2cf2c0e7..d904c54bd 100644 --- a/util/templates/types.go +++ b/util/templates/types.go @@ -201,7 +201,7 @@ type Param struct { // DefaultValue returns a default or example value depending on the renderMode func (p *Param) DefaultValue(renderMode int) interface{} { // return empty list to allow iterating over in template - if p.Type == TypeStringList { + if p.Type == TypeList { return []string{} }