Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support default value for form #1138

Merged
merged 11 commits into from
Apr 25, 2018
Merged

support default value for form #1138

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
13042df
support default value for form
thinkerou Oct 24, 2017
b4d1b55
fix bug for nil interface
thinkerou Oct 24, 2017
4654192
use SplitN and optimization code
thinkerou Oct 24, 2017
e9773bf
add test case
thinkerou Nov 12, 2017
8027a23
add test cases for form(own default value)
thinkerou Nov 12, 2017
8a14fbd
fix conflict
Apr 17, 2018
bcd046b
fix invalid code
Apr 17, 2018
5a1c743
fix code indent
thinkerou Apr 17, 2018
ecea8b5
Merge remote-tracking branch 'upstream/master' into default_form
thinkerou Apr 20, 2018
0d2480e
assert order
thinkerou Apr 20, 2018
a41721a
Merge branch 'master' into default_form
appleboy Apr 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion binding/form_mapping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"errors"
"reflect"
"strconv"
"strings"
"time"
)

Expand All @@ -23,6 +24,15 @@ func mapForm(ptr interface{}, form map[string][]string) error {

structFieldKind := structField.Kind()
inputFieldName := typeField.Tag.Get("form")
inputFieldNameList := strings.Split(inputFieldName, ",")
inputFieldName = inputFieldNameList[0]
var defaultValue interface{}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any need to cast it as interface{}? As I see below, you'll always use it as string and parse it to the specific type, right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, use string, thanks!

if len(inputFieldNameList) > 1 {
defaultList := strings.Split(inputFieldNameList[1], "=")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe use strings.SplitN(inputFieldNameList[1], "=", 2) and remove the condition below len(defaultList) == 2 . as it is right now, is also ok.

https://golang.org/pkg/strings/#SplitN

Copy link
Member Author

@thinkerou thinkerou Oct 24, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we should use SplitN which can reduce some codes(interface{} and len(defaultList)==2). Thx!

if len(defaultList) == 2 && defaultList[0] == "default" {
defaultValue = defaultList[1]
}
}
if inputFieldName == "" {
inputFieldName = typeField.Name

Expand All @@ -38,8 +48,13 @@ func mapForm(ptr interface{}, form map[string][]string) error {
}
}
inputValue, exists := form[inputFieldName]

if !exists {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if inputValue is empty array(inputField exist and its ""), default value not take effect

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you post one example? thanks!

continue
if defaultValue.(string) == "" {
continue
}
inputValue = make([]string, 1)
inputValue[0] = defaultValue.(string)
}

numElems := len(inputValue)
Expand Down