improved

Author: admpub

README.md

@@ -255,17 +255,17 @@ This category includes checkbox, select and radio button fields.
 Checkbox field requires a name and a set of options to populate the field. The options are just a set of InputChoice (Id-Value pairs) objects:
 
 	opts := []fields.InputChoice{
-		fields.InputChoice{"A", "Option A"},
-		fields.InputChoice{"B", "Option B"},
+		fields.InputChoice{Id:"A", Val:"Option A"},
+		fields.InputChoice{Id:"B", Val:"Option B"},
 	}
 	f := fields.CheckboxField("checkbox", opts)
 	f.AddSelected("A", "B")
 
 Radio buttons, instead, require a name and a set of options to populate the field. The options are just a set of InputChoice (Id-Value pairs) objects:
 
 	opts := []fields.InputChoice{
-		fields.InputChoice{"A", "Option A"},
-		fields.InputChoice{"B", "Option B"},
+		fields.InputChoice{Id:"A", Val:"Option A"},
+		fields.InputChoice{Id:"B", Val:"Option B"},
 	}
 	f := fields.RadioField("radio", opts)
 
@@ -274,8 +274,8 @@ Select fields, on the other hand, allow option grouping. This can be achieved by
 	opts := map[string][]fields.InputChoice{
 		"": []fields.InputChoice{fields.InputChoice{"A", "Option A"}},
 		"group1": []fields.InputChoice{
-			fields.InputChoice{"B", "Option B"},
-			fields.InputChoice{"C", "Option C"},
+			fields.InputChoice{Id:"B", Val:"Option B"},
+			fields.InputChoice{Id:"C", Val:"Option C"},
 		}
 	}
 	f := fields.SelectField("select", opts)

fields/field.go

@@ -373,7 +373,13 @@ func (f *Field) RemoveSelected(opt string) FieldInterface {
 func (f *Field) SetChoices(choices interface{}, saveIndex ...bool) FieldInterface {
 	switch f.fieldType {
 	case formcommon.SELECT:
-		ch, _ := choices.(map[string][]InputChoice)
+		var ch map[string][]InputChoice
+		if c, ok := choices.(map[string][]InputChoice); ok {
+			ch = c
+		}else{
+			c, _ := choices.([]InputChoice)
+			ch = map[string][]InputChoice{"":c}
+		}
 		f.choices = ch
 		if len(saveIndex) < 1 || saveIndex[0] {
 			for k, v := range ch {