github/steve
1
0
Fork 0
mirror of https://github.com/niusmallnan/steve.git synced 2025-09-09 09:00:31 +00:00
Code Issues Projects Releases Wiki Activity

Run formatter before links

Browse Source
This commit is contained in:
Darren Shepherd
2019-08-14 13:13:13 -07:00
parent f2c0706220
commit de50acc048
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
vendor/github.com/rancher/norman/pkg/api/writer/json.go generated vendored
View File

@@ -157,12 +157,12 @@ func (j *EncodingResponseWriter) convert(b builder.Builder, context *types.APIRe
ActionLinks: context.Request.Header.Get("X-API-Action-Links") != "",
}
j.addLinks(b, schema, context, input, rawResource)
if schema.Formatter != nil {
schema.Formatter(context, rawResource)
}
j.addLinks(b, schema, context, input, rawResource)
return rawResource
}
@@ -172,12 +172,18 @@ func (j *EncodingResponseWriter) addLinks(b builder.Builder, schema *types.Schem
}
self := context.URLBuilder.ResourceLink(rawResource.Schema, rawResource.ID)
rawResource.Links["self"] = self
if context.AccessControl.CanUpdate(context, types.ToAPI(input), schema) == nil {
rawResource.Links["update"] = self
if _, ok := rawResource.Links["self"]; !ok {
rawResource.Links["self"] = self
}
if context.AccessControl.CanDelete(context, types.ToAPI(input), schema) == nil {
rawResource.Links["remove"] = self
if _, ok := rawResource.Links["update"]; !ok {
if context.AccessControl.CanUpdate(context, types.ToAPI(input), schema) == nil {
rawResource.Links["update"] = self
}
}
if _, ok := rawResource.Links["remove"]; !ok {
if context.AccessControl.CanDelete(context, types.ToAPI(input), schema) == nil {
rawResource.Links["remove"] = self
}
}
}