Show source/target branches on PR's list (go-gitea#19747)

Add ability to show source/target branches for Pull Request's list. It can be useful to see which branches are used in each PR right in the list. Co-authored-by: Alexey Korobkov <[email protected]> Co-authored-by: wxiaoguang <[email protected]> Co-authored-by: Lauris BH <[email protected]>
kitspace · Aug 23, 2022 · e820694 · e820694
1 parent 479a499
commit e820694
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 5 deletions.
diff --git a/models/issue_list.go b/models/issue_list.go
@@ -25,15 +25,16 @@ const (
 	defaultMaxInSize = 50
 )
 
+// get the repo IDs to be loaded later, these IDs are for issue.Repo and issue.PullRequest.HeadRepo
 func (issues IssueList) getRepoIDs() []int64 {
 	repoIDs := make(map[int64]struct{}, len(issues))
 	for _, issue := range issues {
-		if issue.Repo != nil {
-			continue
-		}
-		if _, ok := repoIDs[issue.RepoID]; !ok {
+		if issue.Repo == nil {
 			repoIDs[issue.RepoID] = struct{}{}
 		}
+		if issue.PullRequest != nil && issue.PullRequest.HeadRepo == nil {
+			repoIDs[issue.PullRequest.HeadRepoID] = struct{}{}
+		}
 	}
 	return container.KeysInt64(repoIDs)
 }
@@ -67,8 +68,11 @@ func (issues IssueList) loadRepositories(ctx context.Context) ([]*repo_model.Rep
 		} else {
 			repoMaps[issue.RepoID] = issue.Repo
 		}
-		if issue.PullRequest != nil && issue.PullRequest.BaseRepo == nil {
+		if issue.PullRequest != nil {
 			issue.PullRequest.BaseRepo = issue.Repo
+			if issue.PullRequest.HeadRepo == nil {
+				issue.PullRequest.HeadRepo = repoMaps[issue.PullRequest.HeadRepoID]
+			}
 		}
 	}
 	return valuesRepository(repoMaps), nil

diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl
@@ -59,6 +59,27 @@
 					{{else}}
 						{{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}}
 					{{end}}
+					{{if .IsPull}}
+						<div class="branches">
+							<div class="branch">
+								<a class="bold" href="{{.PullRequest.BaseRepo.HTMLURL}}/src/branch/{{PathEscapeSegments .PullRequest.BaseBranch}}">
+									{{/* inline to remove the spaces between spans */}}
+									{{if ne .RepoID .PullRequest.BaseRepoID}}<span class="truncated-name">{{.PullRequest.BaseRepo.OwnerName}}</span>:{{end}}<span class="truncated-name">{{.PullRequest.BaseBranch}}</span>
+								</a>
+							</div>
+
+							&laquo;
+
+							{{if .PullRequest.HeadRepo}}
+							<div class="branch">
+								<a class="bold" href="{{.PullRequest.HeadRepo.HTMLURL}}/src/branch/{{PathEscapeSegments .PullRequest.HeadBranch}}">
+									{{/* inline to remove the spaces between spans */}}
+									{{if ne .RepoID .PullRequest.HeadRepoID}}<span class="truncated-name">{{.PullRequest.HeadRepo.OwnerName}}</span>:{{end}}<span class="truncated-name">{{.PullRequest.HeadBranch}}</span>
+								</a>
+							</div>
+							{{end}}
+						</div>
+					{{end}}
 					{{if and .Milestone (ne $.listType "milestone")}}
 						<a class="milestone" {{if $.RepoLink}}href="{{$.RepoLink}}/milestone/{{.Milestone.ID}}"{{else}}href="{{.Repo.Link}}/milestone/{{.Milestone.ID}}"{{end}}>
 							{{svg "octicon-milestone" 14 "mr-2"}}{{.Milestone.Name}}

diff --git a/web_src/less/shared/issuelist.less b/web_src/less/shared/issuelist.less
@@ -119,6 +119,23 @@
     }
   }
 
+  .branches {
+    display: inline-flex;
+    padding: 0 6px;
+
+    .branch {
+      background-color: var(--color-secondary);
+      border-radius: 3px;
+    }
+
+    .truncated-name {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      max-width: 10em;
+    }
+  }
+
   > .item + .item {
     border-top: 1px solid var(--color-secondary);
   }