fix

Author: kerwin612

modules/templates/util_render.go

@@ -181,7 +181,7 @@ func (ut *RenderUtils) RenderLabel(label *issues_model.Label) template.HTML {
 		textColor, itemColor, itemHTML)
 }
 
-func (ut *RenderUtils) RenderFolderIcon(isOpen bool) template.HTML {
+func (ut *RenderUtils) RenderFolderIconByOpenState(isOpen bool) template.HTML {
 	if setting.UI.FileIconTheme == "material" {
 		return fileicon.DefaultMaterialIconProvider().FolderIcon(ut.ctx, isOpen)
 	}

routers/web/repo/treelist.go

@@ -72,7 +72,7 @@ type FileDiffFile struct {
 // it also takes a map of file names to their viewed state, which is used to mark files as viewed
 func transformDiffTreeForUI(ctx *context.Context, baseCommit, headCommit *git.Commit, diffTree *gitdiff.DiffTree, filesViewedState map[string]pull_model.ViewedState) []FileDiffFile {
 	files := make([]FileDiffFile, 0, len(diffTree.Files))
-
+	renderUtils := templates.NewRenderUtils(reqctx.FromContext(ctx))
 	for _, file := range diffTree.Files {
 		nameHash := git.HashFilePathForWebUI(file.HeadPath)
 		isSubmodule := file.HeadMode == git.EntryModeCommit
@@ -85,7 +85,7 @@ func transformDiffTreeForUI(ctx *context.Context, baseCommit, headCommit *git.Co
 		files = append(files, FileDiffFile{
 			Name:        file.HeadPath,
 			NameHash:    nameHash,
-			FileIcon:    templates.NewRenderUtils(reqctx.FromContext(ctx)).RenderFileIcon(entry),
+			FileIcon:    renderUtils.RenderFileIcon(entry),
 			IsSubmodule: isSubmodule,
 			IsViewed:    isViewed,
 			Status:      file.Status,

templates/admin/repo/unadopted.tmpl

@@ -21,7 +21,7 @@
 					<div class="ui aligned divided list">
 						{{range $dirI, $dir := .Dirs}}
 							<div class="item tw-flex tw-items-center">
-								<span class="tw-flex-1"> {{ctx.RenderUtils.RenderFolderIcon false}} {{$dir}}</span>
+								<span class="tw-flex-1"> {{ctx.RenderUtils.RenderFolderIconByOpenState false}} {{$dir}}</span>
 								<div>
 									<button class="ui button primary show-modal tw-p-2" data-modal="#adopt-unadopted-modal-{{$dirI}}">{{svg "octicon-plus"}} {{ctx.Locale.Tr "repo.adopt_preexisting_label"}}</button>
 									<div class="ui g-modal-confirm modal" id="adopt-unadopted-modal-{{$dirI}}">

templates/repo/diff/box.tmpl

@@ -15,8 +15,8 @@
 					const diffTreeIcon = `.octicon-sidebar-${diffTreeVisible ? 'expand' : 'collapse'}`;
 					diffTreeBtn.querySelector(diffTreeIcon).classList.remove('tw-hidden');
 					diffTreeBtn.setAttribute('data-tooltip-content', diffTreeBtn.getAttribute(diffTreeVisible ? 'data-hide-text' : 'data-show-text'));
-					window.config.pageData.folderIcon = {{ctx.RenderUtils.RenderFolderIcon false}};
-					window.config.pageData.openFolderIcon = {{ctx.RenderUtils.RenderFolderIcon true}};
+					window.config.pageData.folderIcon = {{ctx.RenderUtils.RenderFolderIconByOpenState false}};
+					window.config.pageData.openFolderIcon = {{ctx.RenderUtils.RenderFolderIconByOpenState true}};
 				</script>
 			{{end}}
 			{{if not .DiffNotAvailable}}

templates/repo/view.tmpl

@@ -1,7 +1,7 @@
 {{template "base/head" .}}
 <script type="module">
-window.config.pageData.folderIcon = {{ctx.RenderUtils.RenderFolderIcon false}};
-window.config.pageData.openFolderIcon = {{ctx.RenderUtils.RenderFolderIcon true}};
+window.config.pageData.folderIcon = {{ctx.RenderUtils.RenderFolderIconByOpenState false}};
+window.config.pageData.openFolderIcon = {{ctx.RenderUtils.RenderFolderIconByOpenState true}};
 </script>
 <div role="main" aria-label="{{.Title}}" class="page-content repository file list {{if .IsBlame}}blame{{end}}">
 	{{template "repo/header" .}}

templates/repo/view_list.tmpl

@@ -6,7 +6,7 @@
 	</div>
 	{{if .HasParentPath}}
 	<a class="repo-file-line parent-link silenced" href="{{.BranchLink}}{{if .ParentPath}}{{PathEscapeSegments .ParentPath}}{{end}}">
-		{{ctx.RenderUtils.RenderFolderIcon false}} ..
+		{{ctx.RenderUtils.RenderFolderIconByOpenState false}} ..
 	</a>
 	{{end}}
 	{{range $item := .Files}}

templates/user/settings/repos.tmpl

@@ -30,7 +30,7 @@
 											<span><a href="{{$repo.BaseRepo.Link}}">{{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}}</a></span>
 										{{end}}
 									{{else}}
-										<span class="icon tw-inline-block tw-pt-2">{{ctx.RenderUtils.RenderFolderIcon false}}</span>
+										<span class="icon tw-inline-block tw-pt-2">{{ctx.RenderUtils.RenderFolderIconByOpenState false}}</span>
 										<span class="name tw-inline-block tw-pt-2">{{$.ContextUser.Name}}/{{$dir}}</span>
 										<div class="tw-float-right">
 											{{if $.allowAdopt}}