Merge branch 'V20211018' of git.openi.org.cn:OpenI/aiforge into repo-statistic

routers/repo/view.go

@@ -808,10 +808,12 @@ func renderCode(ctx *context.Context) {
 				//base repo has the same branch, then compare between current repo branch and base repo's branch
 				compareUrl :=  ctx.Repo.BranchName + "..." + ctx.Repo.Repository.BaseRepo.OwnerName +  "/" + ctx.Repo.Repository.BaseRepo.Name + ":" + ctx.Repo.BranchName
 				ctx.SetParams("*",compareUrl)
+				ctx.Data["UpstreamSameBranchName"] = true
 			}else{
 				//else, compare between current repo branch and base repo's default branch
 				compareUrl :=  ctx.Repo.BranchName + "..." + ctx.Repo.Repository.BaseRepo.OwnerName +  "/" + ctx.Repo.Repository.BaseRepo.Name + ":" + ctx.Repo.Repository.BaseRepo.DefaultBranch
 				ctx.SetParams("*",compareUrl)
+				ctx.Data["UpstreamSameBranchName"] = false
 			}
 			_, _, headGitRepo, compareInfo, _, _ := ParseCompareInfo(ctx)
 			defer headGitRepo.Close()

templates/repo/home.tmpl

@@ -75,7 +75,7 @@
     z-index: 11;
     will-change: transform, opacity;
     width: 100% !important;
-	
+
 	-webkit-animation-iteration-count: 1;
     animation-iteration-count: 1;
     -webkit-animation-duration: 300ms;
@@ -86,7 +86,7 @@
     animation-fill-mode: both;
 }
 
-	
+
 
 
 </style>
@@ -94,7 +94,7 @@
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
-		
+
 		{{if and .Permission.IsAdmin (not .Repository.IsArchived)}}
 			<!-- <div class="ui repo-topic-edit grid form segment error" id="topic_edit" style="display:none">
 				<div class="fourteen wide column">
@@ -113,13 +113,13 @@
 					data-link="{{.RepoLink}}/topics">{{.i18n.Tr "repo.topic.done"}}</a>
 				</div>
 			</div> -->
-			
+
 			{{end}}
 			<div class="hide" id="validate_prompt">
 				<span id="count_prompt">{{.i18n.Tr "repo.topic.count_prompt"}}</span>
 				<span id="format_prompt">{{.i18n.Tr "repo.topic.format_prompt"}}</span>
 			</div>
-		<div class="ui repo-description stackable grid">			
+		<div class="ui repo-description stackable grid">
 
 			{{if .RepoSearchEnabled}}
 				<div class="ui repo-search four wide column">
@@ -136,7 +136,7 @@
 				</div>
 			{{end}}
 		</div>
-		
+
 		{{if .Repository.IsArchived}}
 			<div class="ui warning message">
 				{{.i18n.Tr "repo.archive.title"}}
@@ -156,7 +156,7 @@
 						</a>
 						{{if and .Repository.IsFork .PullRequestCtx.Allowed}}
 							{{if gt .FetchUpstreamCnt 0 }}
-								<a href="{{.Repository.Link}}/compare/{{.BranchName | EscapePound}}...{{.BaseRepo.Owner.Name}}:{{.BaseRepo.DefaultBranch | EscapePound}}">
+								<a href="{{.Repository.Link}}/compare/{{.BranchName | EscapePound}}...{{.BaseRepo.Owner.Name}}:{{if .UpstreamSameBranchName}}{{.BranchName | EscapePound}}{{else}}{{.BaseRepo.DefaultBranch | EscapePound}}{{end}}">
 									<button id="new-pull-request" class="ui compact basic button" title="{{$.i18n.Tr (TrN $.i18n.Lang .FetchUpstreamCnt "repo.pulls.commits_count_1" "repo.pulls.commits_count_n") .FetchUpstreamCnt}}">{{.i18n.Tr "repo.pulls.fetch_upstream"}}</button>
 								</a>
 							{{else if lt .FetchUpstreamCnt 0}}
@@ -164,7 +164,7 @@
 									<button id="new-pull-request" class="ui compact basic button" title="{{.i18n.Tr "repo.pulls.upstream_error"}}">{{.i18n.Tr "repo.pulls.fetch_upstream"}}</button>
 								</a>
 							{{else}}
-								<a href="{{.Repository.Link}}/compare/{{.BranchName | EscapePound}}...{{.BaseRepo.Owner.Name}}:{{.BaseRepo.DefaultBranch | EscapePound}}">
+								<a href="{{.Repository.Link}}/compare/{{.BranchName | EscapePound}}...{{.BaseRepo.Owner.Name}}:{{if .UpstreamSameBranchName}}{{.BranchName | EscapePound}}{{else}}{{.BaseRepo.DefaultBranch | EscapePound}}{{end}}">
 									<button id="new-pull-request" class="ui compact basic button" title="{{.i18n.Tr "repo.pulls.upstream_up_to_date"}}">{{.i18n.Tr "repo.pulls.fetch_upstream"}}</button>
 								</a>
 							{{end}}
@@ -254,7 +254,7 @@
 						{{template "repo/view_list" .}}
 					{{end}}
 				</div>
-				<div class="ui six wide tablet four wide computer column">					
+				<div class="ui six wide tablet four wide computer column">
 					<div id="repo-desc">
 						<h4 id="about-desc" class="ui header">简介
 								<!-- <a  class="edit-icon" href="javascript:void(0)">
@@ -267,33 +267,33 @@
 							{{else}}
 								<span class="no-description text-italic">{{.i18n.Tr "repo.no_desc"}}</span>
 							{{end}}
-							
+
 						</p>
 
 					</div>
 
-					
+
 
 					{{if .Repository.Website}}
 					<p class="ui">
 						<i class="gray linkify icon"></i>
 						<a class="link edit-link" target="_blank" title="{{.Repository.Website}}" href="{{.Repository.Website}}">{{.Repository.Website}}</a>
 					</p>
-					
-					{{end}}		
+
+					{{end}}
 
 					<div class="ui" id="repo-topics" style="display: flex;position: relative;margin-bottom: 1.0rem;">
 						<i class="grey bookmark icon"></i>
-						
+
 						<div id="repo-topics1" style="flex: 1;">
 							<!-- {{if not .Topics}}
 							<span class="no-description text-italic">{{.i18n.Tr "repo.no_desc"}}</span>
 							{{end}} -->
 							{{range .Topics}}
-							
+
 								<a class="ui repo-topic small label topic" href="{{AppSubUrl}}/explore/repos?q={{.Name}}&topic=1">{{.Name}}</a>
-								
-								
+
+
 							{{end}}
 						</div>
 						<div>
@@ -301,13 +301,13 @@
 						</div>
 						<div id="topic_edit" class="vue_menu" style="display:none">
 							<div id="topic_edit1">
-									
+
 							</div>
 						</div>
-						
+
 					</div>
-					
-					
+
+
 					<p class="ui">
 						<i class="grey code icon"></i>
 						{{range .LanguageStats}}
@@ -315,14 +315,14 @@
 						{{end}}
 					</p>
 
-					
-					
+
+
 					{{if .LICENSE}}
 					<p class="ui">
 						<i class="grey clone icon"></i>
 							{{.LICENSE}}
 					</p>
-					
+
 					{{end}}
 
 					<div class="ui divider"></div>
@@ -338,22 +338,22 @@
 							{{range .ContributorInfo}}
 								{{if .UserInfo}}
 									<a href="{{AppSubUrl}}/{{.UserInfo.Name}}"><img class="ui avatar image" src="{{.UserInfo.RelAvatarLink}}"></a>
-								{{else if .Email}}								    
+								{{else if .Email}}
 									<a href="mailto:{{.Email}}" class="circular ui button">{{.Email}}</a>
 								{{end}}
 							{{end}}
-						</div>						
+						</div>
 					</div>
-					
+
 				</div>
-			</div>			
+			</div>
 		</div>
-		
+
 	</div>
 </div>
 
 <script type="text/javascript">
-$(document).ready(function(){ 
+$(document).ready(function(){
     $(".membersmore").click(function(){
        $("#contributorInfo > a:nth-child(n+25)").show();
     });