Merge pull request #102 from gobuffalo/bugfix/select-tag-only

Fixes #101
gobuffalo · Jul 2, 2018 · 305d504 · 305d504
2 parents 42d8ed7 + 7fff6e5
commit 305d504
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 10 deletions.
diff --git a/form/bootstrap/form_for_test.go b/form/bootstrap/form_for_test.go
@@ -307,6 +307,15 @@ func Test_Field_TagOnly(t *testing.T) {
 			output: `<input class="" id="-Name" name="Name" type="checkbox" value="true" />`,
 		},
 
+		{
+			f:    f.SelectTag,
+			name: "Name",
+			opts: tags.Options{
+				"tag_only": true,
+			},
+			output: `<select class="" id="-Name" name="Name"></select>`,
+		},
+
 		{
 			f:    f.FileTag,
 			name: "Name",

diff --git a/form/form_for.go b/form/form_for.go
@@ -136,7 +136,7 @@ func (f FormFor) RadioButtonTag(field string, opts tags.Options) *tags.Tag {
 }
 
 //SelectTag creates a select tag for a specified struct field and loads options from the options opject
-func (f FormFor) SelectTag(field string, opts tags.Options) *SelectTag {
+func (f FormFor) SelectTag(field string, opts tags.Options) *tags.Tag {
 	f.buildOptions(field, opts)
 	return f.Form.SelectTag(opts)
 }

diff --git a/form/select_tag.go b/form/select_tag.go
@@ -16,12 +16,6 @@ type SelectTag struct {
 }
 
 func (s SelectTag) String() string {
-	for _, x := range s.SelectOptions {
-		if _, ok := s.selectedValueCache[template.HTMLEscaper(x.Value)]; ok {
-			x.Selected = true
-		}
-		s.Append(x.String())
-	}
 	return s.Tag.String()
 }
 
@@ -31,7 +25,7 @@ func (s SelectTag) HTML() template.HTML {
 }
 
 // NewSelectTag constructs a new `<select>` tag.
-func NewSelectTag(opts tags.Options) *SelectTag {
+func NewSelectTag(opts tags.Options) *tags.Tag {
 	so := parseSelectOptions(opts)
 	selected := opts["value"]
 	delete(opts, "value")
@@ -70,17 +64,27 @@ func NewSelectTag(opts tags.Options) *SelectTag {
 		selectedMap[template.HTMLEscaper(selected)] = struct{}{}
 	}
 
+	delete(opts, "tag_only")
+
 	st := &SelectTag{
 		Tag:                tags.New("select", opts),
 		SelectOptions:      so,
 		SelectedValue:      selected,
 		selectedValueCache: selectedMap,
 	}
-	return st
+
+	for _, x := range st.SelectOptions {
+		if _, ok := st.selectedValueCache[template.HTMLEscaper(x.Value)]; ok {
+			x.Selected = true
+		}
+		st.Append(x.String())
+	}
+
+	return st.Tag
 }
 
 // SelectTag constructs a new `<select>` tag from a form.
-func (f Form) SelectTag(opts tags.Options) *SelectTag {
+func (f Form) SelectTag(opts tags.Options) *tags.Tag {
 	return NewSelectTag(opts)
 }
 

diff --git a/form/select_tag_test.go b/form/select_tag_test.go
@@ -31,6 +31,21 @@ func Test_SelectTagWithOptions(t *testing.T) {
 	r.Equal(`<select><option value="1">1/2 day</option><option value="2">1-2 days</option><option value="7">1 week</option><option value="14">1-2 weeks</option></select>`, s.String())
 }
 
+func Test_SelectTagWithOptionsSelected(t *testing.T) {
+	r := require.New(t)
+	f := form.New(tags.Options{})
+	s := f.SelectTag(tags.Options{
+		"options": []map[string]interface{}{
+			{"1/2 day": 1},
+			{"1-2 days": 2},
+			{"1 week": 7},
+			{"1-2 weeks": 14},
+		},
+		"value": 1,
+	})
+	r.Equal(`<select><option value="1" selected>1/2 day</option><option value="2">1-2 days</option><option value="7">1 week</option><option value="14">1-2 weeks</option></select>`, s.String())
+}
+
 func Test_SelectTag_WithSelectOptions(t *testing.T) {
 	r := require.New(t)
 	f := form.New(tags.Options{})