From 38674e71da9dbcf0fce12f8c4612b6a99beef40e Mon Sep 17 00:00:00 2001
From: chenyifan01 <gitea@fake.local>
Date: Mon, 28 Mar 2022 15:12:18 +0800
Subject: [PATCH] #1641 fix bug

---
 routers/repo/view.go          | 24 ++++++++++++++----------
 templates/repo/view_file.tmpl |  4 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/routers/repo/view.go b/routers/repo/view.go
index 320102ba40..b28e21aa17 100755
--- a/routers/repo/view.go
+++ b/routers/repo/view.go
@@ -247,7 +247,11 @@ func renderDirectory(ctx *context.Context, treeLink string) {
 		ctx.Data["ReadmeInList"] = true
 		ctx.Data["ReadmeExist"] = true
 		ctx.Data["FileIsSymlink"] = readmeFile.isSymlink
-		ctx.Data["ReadmeName"] = readmeFile.name
+		if ctx.Repo.TreePath == "" {
+			ctx.Data["ReadmeRelativePath"] = readmeFile.name
+		} else {
+			ctx.Data["ReadmeRelativePath"] = ctx.Repo.TreePath + "/" + readmeFile.name
+		}
 
 		if ctx.Repo.CanEnableEditor() {
 			ctx.Data["CanEditFile"] = true
@@ -579,11 +583,11 @@ func safeURL(address string) string {
 }
 
 type ContributorInfo struct {
-	UserInfo  *models.User // nil for contributor who is not a registered user
-	RelAvatarLink	string	`json:"rel_avatar_link"`
-	UserName  string       `json:"user_name"`
-	Email     string       `json:"email"`
-	CommitCnt int          `json:"commit_cnt"`
+	UserInfo      *models.User // nil for contributor who is not a registered user
+	RelAvatarLink string       `json:"rel_avatar_link"`
+	UserName      string       `json:"user_name"`
+	Email         string       `json:"email"`
+	CommitCnt     int          `json:"commit_cnt"`
 }
 
 type GetContributorsInfo struct {
@@ -642,7 +646,7 @@ func Home(ctx *context.Context) {
 						existedContributorInfo.CommitCnt += c.CommitCnt
 					} else {
 						var newContributor = &ContributorInfo{
-							user, "", "",c.Email, c.CommitCnt,
+							user, "", "", c.Email, c.CommitCnt,
 						}
 						count++
 						contributorInfos = append(contributorInfos, newContributor)
@@ -839,7 +843,7 @@ func renderCode(ctx *context.Context) {
 				compareInfo, err = baseGitRepo.GetCompareInfo(ctx.Repo.Repository.RepoPath(), ctx.Repo.BranchName, ctx.Repo.Repository.BaseRepo.DefaultBranch)
 				ctx.Data["UpstreamSameBranchName"] = false
 			}
-			if err==nil && compareInfo != nil {
+			if err == nil && compareInfo != nil {
 				if compareInfo.Commits != nil {
 					log.Info("compareInfoCommits数量:%d", compareInfo.Commits.Len())
 					ctx.Data["FetchUpstreamCnt"] = compareInfo.Commits.Len()
@@ -950,7 +954,7 @@ func ContributorsAPI(ctx *context.Context) {
 				} else {
 					// new committer info
 					var newContributor = &ContributorInfo{
-						user, user.RelAvatarLink(),user.Name, user.Email,c.CommitCnt,
+						user, user.RelAvatarLink(), user.Name, user.Email, c.CommitCnt,
 					}
 					count++
 					contributorInfos = append(contributorInfos, newContributor)
@@ -963,7 +967,7 @@ func ContributorsAPI(ctx *context.Context) {
 					existedContributorInfo.CommitCnt += c.CommitCnt
 				} else {
 					var newContributor = &ContributorInfo{
-						user, "", "",c.Email,c.CommitCnt,
+						user, "", "", c.Email, c.CommitCnt,
 					}
 					count++
 					contributorInfos = append(contributorInfos, newContributor)
diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl
index a0cae31f3c..a559dd6110 100755
--- a/templates/repo/view_file.tmpl
+++ b/templates/repo/view_file.tmpl
@@ -40,7 +40,7 @@
 			<div class="ui right file-actions">
 				{{if .Repository.CanEnableEditor}}
 					{{if .CanEditFile}}
-						<a href="{{.RepoLink}}/_edit/{{EscapePound .BranchName}}/{{EscapePound .ReadmeName}}"><span class="btn-octicon poping up"  data-content="{{.EditFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-pencil" 16}}</span></a>
+						<a href="{{.RepoLink}}/_edit/{{EscapePound .BranchName}}/{{EscapePound .ReadmeRelativePath}}"><span class="btn-octicon poping up"  data-content="{{.EditFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-pencil" 16}}</span></a>
 					{{else}}
 						<span class="btn-octicon poping up disabled" data-content="{{.EditFileTooltip}}" data-position="bottom center" data-variation="tiny inverted">{{svg "octicon-pencil" 16}}</span>
 					{{end}}
@@ -48,7 +48,7 @@
 			</div>
 		</div>
 		{{end}}
-		
+
 		{{if not .ReadmeInList}}
 		<div class="file-header-right">
 			<div class="ui right file-actions">
-- 
2.34.1