hero/mvc: func result -> struct, map, slices check if content type is already given by other output value before setting it, look the previous commit for more [2]

Former-commit-id: 3e86857d5a7141f6609ad09a46349cfea3e33a89
This commit is contained in:
Gerasimos (Makis) Maropoulos 2019-06-14 11:33:01 +03:00
parent 41d225af3b
commit c93093d6c2

View File

@ -334,15 +334,18 @@ func DispatchFuncResult(ctx context.Context, errorHandler ErrorHandler, values [
if custom == nil { if custom == nil {
// if it's a pointer to struct/map. // if it's a pointer to struct/map.
if di.IsNil(v) && contentType == "" { if di.IsNil(v) {
// if just a ptr to struct with no content type given // if just a ptr to struct with no content type given
// then try to get the previous response writer's content type, // then try to get the previous response writer's content type,
// and if that is empty too then force-it to application/json // and if that is empty too then force-it to application/json
// as the default content type we use for structs/maps. // as the default content type we use for structs/maps.
contentType = ctx.GetContentType()
if contentType == "" { if contentType == "" {
contentType = context.ContentJSONHeaderValue contentType = ctx.GetContentType()
if contentType == "" {
contentType = context.ContentJSONHeaderValue
}
} }
continue continue
} }