From 89e33062548e85ee16a661f866a08c14ea674f3c Mon Sep 17 00:00:00 2001 From: Cory Bennett Date: Thu, 24 Aug 2017 10:59:58 -0700 Subject: [PATCH] set defaults in structs rather than kingpin so they can be overriden by configs --- jiracli/list.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/jiracli/list.go b/jiracli/list.go index f9072d0..79de2b7 100644 --- a/jiracli/list.go +++ b/jiracli/list.go @@ -15,6 +15,11 @@ func (jc *JiraCli) CmdListRegistry() *CommandRegistryEntry { GlobalOptions: GlobalOptions{ Template: "list", }, + SearchOptions: SearchOptions{ + MaxResults: 500, + QueryFields: "assignee,created,priority,reporter,status,summary,updated", + Sort: "priority asc, key", + }, } return &CommandRegistryEntry{ @@ -37,17 +42,12 @@ func (jc *JiraCli) CmdListUsage(cmd *kingpin.CmdClause, opts *ListOptions) error cmd.Flag("assignee", "User assigned the issue").Short('a').StringVar(&opts.Assignee) cmd.Flag("component", "Component to search for").Short('c').StringVar(&opts.Component) cmd.Flag("issuetype", "Issue type to search for").Short('i').StringVar(&opts.IssueType) - // FIXME Default - cmd.Flag("limit", "Maximum number of results to return in search").Short('l').Default("500").IntVar(&opts.MaxResults) + 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("query", "Jira Query Language (JQL) expression for the search").Short('q').StringVar(&opts.Query) - // FIXME Default - cmd.Flag("queryfields", "Fields that are used in \"list\" template").Short('f').Default( - "assignee,created,priority,reporter,status,summary,updated", - ).StringVar(&opts.QueryFields) + cmd.Flag("queryfields", "Fields that are used in \"list\" template").Short('f').StringVar(&opts.QueryFields) cmd.Flag("reporter", "Reporter to search for").Short('r').StringVar(&opts.Reporter) - // FIXME Default - cmd.Flag("sort", "Sort order to return").Short('s').Default("priority asc, key").StringVar(&opts.Sort) + cmd.Flag("sort", "Sort order to return").Short('s').StringVar(&opts.Sort) cmd.Flag("watcher", "Watcher to search for").Short('w').StringVar(&opts.Watcher) return nil }