fix: ignore template flag

palladius · Nov 6, 2024 · a780b48 · a780b48
1 parent 30066b0
commit a780b48
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/pkg/cmd/pr/create/create.go b/pkg/cmd/pr/create/create.go
@@ -278,6 +278,9 @@ func createRun(opts *CreateOptions) (err error) {
 			state.Title = opts.Title
 			state.Body = opts.Body
 		}
+		if opts.Template != "" {
+			state.Template = opts.Template
+		}
 		err = handlePush(*opts, *ctx)
 		if err != nil {
 			return

diff --git a/pkg/cmd/pr/shared/params.go b/pkg/cmd/pr/shared/params.go
@@ -27,6 +27,10 @@ func WithPrAndIssueQueryParams(client *api.Client, baseRepo ghrepo.Interface, ba
 	if len(state.Assignees) > 0 {
 		q.Set("assignees", strings.Join(state.Assignees, ","))
 	}
+	// Embded a template only if the body is empty, which is useful for Web Mode, and avoid duplication in Editor Mode
+	if len(state.Template) > 0 && len(state.Body) == 0 {
+		q.Set("template", state.Template)
+	}
 	if len(state.Labels) > 0 {
 		q.Set("labels", strings.Join(state.Labels, ","))
 	}
@@ -40,6 +44,7 @@ func WithPrAndIssueQueryParams(client *api.Client, baseRepo ghrepo.Interface, ba
 	if len(state.Milestones) > 0 {
 		q.Set("milestone", state.Milestones[0])
 	}
+
 	u.RawQuery = q.Encode()
 	return u.String(), nil
 }

diff --git a/pkg/cmd/pr/shared/state.go b/pkg/cmd/pr/shared/state.go
@@ -23,6 +23,8 @@ type IssueMetadataState struct {
 	Body  string
 	Title string
 
+	Template string
+
 	Metadata   []string
 	Reviewers  []string
 	Assignees  []string