From 00cba793ad2ff10b3b7f26b3c293d2439338fc7d Mon Sep 17 00:00:00 2001
From: Cory Bennett <cbennett@netflix.com>
Date: Wed, 13 Sep 2017 12:17:59 -0700
Subject: [PATCH] tweaks for templates in named queries to work better

---
 .jira.d/config.yml |  6 +++---
 jiracmd/edit.go    |  2 +-
 jiracmd/list.go    |  2 +-
 search.go          | 22 +++++++++++-----------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.jira.d/config.yml b/.jira.d/config.yml
index 607faf2..55d7223 100644
--- a/.jira.d/config.yml
+++ b/.jira.d/config.yml
@@ -5,7 +5,7 @@ endpoint: https://go-jira.atlassian.net
 user: admin
 
 queries:
-  todo: |-
+  todo: |
     resolution = unresolved {{if .project}}AND project = '{{.project}}'{{end}} AND status = 'To Do'
-  progress: |-
-    resolution = unresolved {{if .project}}AND project = '{{.project}}'{{end}} AND status = 'In Progress'
+  open: |
+    resolution = unresolved {{if .project}}AND project = '{{.project}}'{{end}} AND status = 'Open'
diff --git a/jiracmd/edit.go b/jiracmd/edit.go
index 61c8eba..44865b1 100644
--- a/jiracmd/edit.go
+++ b/jiracmd/edit.go
@@ -46,7 +46,7 @@ func CmdEditUsage(cmd *kingpin.CmdClause, opts *EditOptions, fig *figtree.FigTre
 	jiracli.EditorUsage(cmd, &opts.CommonOptions)
 	jiracli.TemplateUsage(cmd, &opts.CommonOptions)
 	cmd.Flag("noedit", "Disable opening the editor").SetValue(&opts.SkipEditing)
-	cmd.Flag("named-query", "The name of a query in the `queries` configuration").Short('n').Action(func(ctx *kingpin.ParseContext) error {
+	cmd.Flag("named-query", "The name of a query in the `queries` configuration").Short('n').PreAction(func(ctx *kingpin.ParseContext) error {
 		name := jiracli.FlagValue(ctx, "named-query")
 		if query, ok := opts.Queries[name]; ok && query != "" {
 			var err error
diff --git a/jiracmd/list.go b/jiracmd/list.go
index 13db0bb..de93e4b 100644
--- a/jiracmd/list.go
+++ b/jiracmd/list.go
@@ -52,7 +52,7 @@ func CmdListUsage(cmd *kingpin.CmdClause, opts *ListOptions, fig *figtree.FigTre
 	cmd.Flag("issuetype", "Issue type to search for").Short('i').StringVar(&opts.IssueType)
 	cmd.Flag("limit", "Maximum number of results to return in search").Short('l').IntVar(&opts.MaxResults)
 	cmd.Flag("project", "Project to search for").Short('p').StringVar(&opts.Project)
-	cmd.Flag("named-query", "The name of a query in the `queries` configuration").Short('n').Action(func(ctx *kingpin.ParseContext) error {
+	cmd.Flag("named-query", "The name of a query in the `queries` configuration").Short('n').PreAction(func(ctx *kingpin.ParseContext) error {
 		name := jiracli.FlagValue(ctx, "named-query")
 		if query, ok := opts.Queries[name]; ok && query != "" {
 			var err error
diff --git a/search.go b/search.go
index eb24f90..cee1203 100644
--- a/search.go
+++ b/search.go
@@ -14,17 +14,17 @@ type SearchProvider interface {
 }
 
 type SearchOptions struct {
-	Assignee    string
-	Query       string
-	QueryFields string
-	Project     string
-	Component   string
-	IssueType   string
-	Watcher     string
-	Reporter    string
-	Status      string
-	Sort        string
-	MaxResults  int
+	Assignee    string `yaml:"assignee,omitempty" json:"assignee,omitempty"`
+	Query       string `yaml:"query,omitempty" json:"query,omitempty"`
+	QueryFields string `yaml:"query-fields,omitempty" json:"query-fields,omitempty"`
+	Project     string `yaml:"project,omitempty" json:"project,omitempty"`
+	Component   string `yaml:"component,omitempty" json:"component,omitempty"`
+	IssueType   string `yaml:"issue-type,omitempty" json:"issue-type,omitempty"`
+	Watcher     string `yaml:"watcher,omitempty" json:"watcher,omitempty"`
+	Reporter    string `yaml:"reporter,omitempty" json:"reporter,omitempty"`
+	Status      string `yaml:"status,omitempty" json:"status,omitempty"`
+	Sort        string `yaml:"sort,omitempty" json:"sort,omitempty"`
+	MaxResults  int    `yaml:"max-results,omitempty" json:"max-results,omitempty"`
 }
 
 func (o *SearchOptions) ProvideSearchRequest() *jiradata.SearchRequest {