simplify

Author: a1012112796

modules/context/repo.go

@@ -16,6 +16,7 @@ import (
 	"code.gitea.io/gitea/modules/cache"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/markup"
 	"code.gitea.io/gitea/modules/markup/markdown"
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
@@ -378,9 +379,16 @@ func repoAssignment(ctx *Context, repo *models.Repository) {
 	}
 
 	for index, btn := range repo.CustomRepoButtons {
-		if !btn.IsLink() {
-			repo.CustomRepoButtons[index].RenderedContent = string(markdown.Render([]byte(btn.Content), ctx.Repo.RepoLink,
-				ctx.Repo.Repository.ComposeMetas()))
+		if btn.IsLink() {
+			continue
+		}
+
+		if repo.CustomRepoButtons[index].RenderedContent, err = markdown.RenderString(&markup.RenderContext{
+			URLPrefix: ctx.Repo.Repository.Link(),
+			Metas:     ctx.Repo.Repository.ComposeMetas(),
+		}, btn.Content); err != nil {
+			ctx.ServerError("LoadCustomRepoButton", err)
+			return
 		}
 	}
 }

templates/repo/header.tmpl

@@ -42,6 +42,7 @@
 			</div>
 			{{if not .IsBeingCreated}}
 				<div class="repo-buttons">
+					{{ $index := 0}}
 					{{range .CustomRepoButtons}}
 						<div class="ui labeled button">
 							{{if .IsLink}}
@@ -50,12 +51,20 @@
 								</a>
 							{{else}}
 								<a class="ui basic label show-repo-button-content"
-									data-title="{{.Title}}"
-									data-content="{{.RenderedContent}}">
+									data-index="{{$index}}">
 									{{.Title}}
 								</a>
+								<div class="ui modal custom-repo-buttons" id="detail-modal-{{$index}}">
+									{{svg "octicon-x" 16 "close inside"}}
+									<div class="content">
+										<div class="sub header">{{.Title}}</div>
+										<div class="ui divider"></div>
+										<div class="render-content markdown">{{.RenderedContent|Str2html}}</div>
+									</div>
+								</div>
 							{{end}}
 						</div>
+						{{ $index = Add $index 1}}
 					{{end}}
 					{{if $.RepoTransfer}}
 						<form method="post" action="{{$.RepoLink}}/action/accept_transfer?redirect_to={{$.RepoLink}}">
@@ -114,15 +123,6 @@
 		</div><!-- end grid -->
 	</div><!-- end container -->
 
-	<div class="ui modal custom-repo-buttons" id="detail-modal">
-		{{svg "octicon-x" 16 "close inside"}}
-		<div class="content">
-			<div class="sub header"></div>
-			<div class="ui divider"></div>
-			<div class="render-content markdown"></div>
-		</div>
-	</div>
-
 {{end}}
 	<div class="ui tabs container">
 		{{if not .Repository.IsBeingCreated}}

web_src/js/index.js

@@ -1286,12 +1286,8 @@ async function initRepository() {
       return;
     }
 
-    const $detailModal = $('#detail-modal');
-
     $('.show-repo-button-content').on('click', function () {
-      $detailModal.find('.content .render-content').html($(this).data('content'));
-      $detailModal.find('.sub.header').text($(this).data('title'));
-      $detailModal.modal('show');
+      $(`#detail-modal-${$(this).data('index')}`).modal('show');
       return false;
     });
   })();