rename draft -> wip

go-gitea · Jan 29, 2024 · 7678d44 · 7678d44
1 parent 0e8365d
commit 7678d44
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/modules/structs/issue.go b/modules/structs/issue.go
@@ -26,9 +26,9 @@ const (
 
 // PullRequestMeta PR info if an issue is a PR
 type PullRequestMeta struct {
-	HasMerged bool       `json:"merged"`
-	Merged    *time.Time `json:"merged_at"`
-	IsDraft   bool       `json:"draft"`
+	HasMerged          bool       `json:"merged"`
+	Merged             *time.Time `json:"merged_at"`
+	IsWorkInProgress   bool       `json:"wip"`
 }
 
 // RepositoryMeta basic repository information

diff --git a/services/convert/issue.go b/services/convert/issue.go
@@ -98,8 +98,8 @@ func toIssue(ctx context.Context, issue *issues_model.Issue, getDownloadURL func
 		}
 		if issue.PullRequest != nil {
 			apiIssue.PullRequest = &api.PullRequestMeta{
-				HasMerged: issue.PullRequest.HasMerged,
-				IsDraft:   issue.PullRequest.IsWorkInProgress(ctx),
+				HasMerged:          issue.PullRequest.HasMerged,
+				IsWorkInProgress:   issue.PullRequest.IsWorkInProgress(ctx),
 			}
 			if issue.PullRequest.HasMerged {
 				apiIssue.PullRequest.Merged = issue.PullRequest.MergedUnix.AsTimePtr()

diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
diff --git a/web_src/js/components/ContextPopup.vue b/web_src/js/components/ContextPopup.vue
@@ -30,8 +30,8 @@ export default {
     icon() {
       if (this.issue.pull_request !== null) {
         if (this.issue.state === 'open') {
-          if (this.issue.pull_request.draft === true) {
-            return 'octicon-git-pull-request-draft'; // Draft PR
+          if (this.issue.pull_request.wip === true) {
+            return 'octicon-git-pull-request-draft'; // WIP PR
           }
           return 'octicon-git-pull-request'; // Open PR
         } else if (this.issue.pull_request.merged === true) {
@@ -46,8 +46,8 @@ export default {
 
     color() {
       if (this.issue.pull_request !== null) {
-        if (this.issue.pull_request.draft === true) {
-          return 'grey'; // Draft PR
+        if (this.issue.pull_request.wip === true) {
+          return 'grey'; // WIP PR
         } else if (this.issue.pull_request.merged === true) {
           return 'purple'; // Merged PR
         }