From 09adcbdcd905028781e99c5b931f0aef01581782 Mon Sep 17 00:00:00 2001 From: Manfred Touron Date: Fri, 19 May 2017 20:10:20 +0200 Subject: [PATCH] Make urlHasVarsFromMessage consistent with getMessageType --- examples/dummy/output/export.json | 7 ++++--- examples/sitemap/sitemap.xml | 6 +++--- helpers/helpers.go | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/examples/dummy/output/export.json b/examples/dummy/output/export.json index 47a574d..e3735f8 100644 --- a/examples/dummy/output/export.json +++ b/examples/dummy/output/export.json @@ -1,6 +1,6 @@ { - "build-date": "2017-05-02T11:50:25.063291628+02:00", - "build-hostname": "manfred-spacegray.local", + "build-date": "2017-05-19T20:09:45.954357761+02:00", + "build-hostname": "manfred-spacegray.aircard", "build-user": "moul", "pwd": "/Users/moul/Git/moul/protoc-gen-gotemplate/examples/dummy", "debug": false, @@ -839,5 +839,6 @@ "options": {} } ] - } + }, + "enum": null } \ No newline at end of file diff --git a/examples/sitemap/sitemap.xml b/examples/sitemap/sitemap.xml index 2a7a647..9c6bc27 100644 --- a/examples/sitemap/sitemap.xml +++ b/examples/sitemap/sitemap.xml @@ -4,18 +4,18 @@ /posts 0.5 monthly - 2017-03-31 + 2017-05-19 /authors 0.5 monthly - 2017-03-31 + 2017-05-19 /comments 0.5 monthly - 2017-03-31 + 2017-05-19 diff --git a/helpers/helpers.go b/helpers/helpers.go index d25194f..a83f9e7 100644 --- a/helpers/helpers.go +++ b/helpers/helpers.go @@ -338,7 +338,7 @@ func httpVerb(m *descriptor.MethodDescriptorProto) string { } } -func urlHasVarsFromMessage(path string, d *descriptor.DescriptorProto) bool { +func urlHasVarsFromMessage(path string, d *ggdescriptor.Message) bool { for _, field := range d.Field { if !isFieldMessage(field) { if strings.Contains(path, fmt.Sprintf("{%s}", *field.Name)) {