mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 05:11:41 +01:00 
			
		
		
		
	Refactor the "attachments" sub-template data key to RenderedContent (#29517)
The value passed into "attachments" sub-template is from "RedneredContent", so use the same name for consistent. And it makes readers easy to know its data type.
This commit is contained in:
		
							parent
							
								
									fb42972c05
								
							
						
					
					
						commit
						b8a598e6a4
					
				| @ -63,7 +63,7 @@ | ||||
| 			<div id="issuecomment-{{.ID}}-raw" class="raw-content gt-hidden">{{.Content}}</div> | ||||
| 			<div class="edit-content-zone gt-hidden" data-update-url="{{$.root.RepoLink}}/comments/{{.ID}}" data-context="{{$.root.RepoLink}}" data-attachment-url="{{$.root.RepoLink}}/comments/{{.ID}}/attachments"></div> | ||||
| 			{{if .Attachments}} | ||||
| 				{{template "repo/issue/view_content/attachments" dict "ctxData" $ "Attachments" .Attachments "Content" .RenderedContent}} | ||||
| 				{{template "repo/issue/view_content/attachments" dict "ctxData" $ "Attachments" .Attachments "RenderedContent" .RenderedContent}} | ||||
| 			{{end}} | ||||
| 		</div> | ||||
| 		{{$reactions := .Reactions.GroupByType}} | ||||
|  | ||||
| @ -62,7 +62,7 @@ | ||||
| 						<div id="issue-{{.Issue.ID}}-raw" class="raw-content gt-hidden">{{.Issue.Content}}</div> | ||||
| 						<div class="edit-content-zone gt-hidden" data-update-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/content" data-context="{{.RepoLink}}" data-attachment-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/attachments" data-view-attachment-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/view-attachments"></div> | ||||
| 						{{if .Issue.Attachments}} | ||||
| 							{{template "repo/issue/view_content/attachments" dict "ctxData" $ "Attachments" .Issue.Attachments "Content" .Issue.RenderedContent}} | ||||
| 							{{template "repo/issue/view_content/attachments" dict "ctxData" $ "Attachments" .Issue.Attachments "RenderedContent" .Issue.RenderedContent}} | ||||
| 						{{end}} | ||||
| 					</div> | ||||
| 					{{$reactions := .Issue.Reactions.GroupByType}} | ||||
|  | ||||
| @ -8,7 +8,7 @@ | ||||
| 			<div class="gt-f1 gt-p-3"> | ||||
| 				<a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}" title="{{ctx.Locale.Tr "repo.issues.attachment.open_tab" .Name}}"> | ||||
| 					{{if FilenameIsImage .Name}} | ||||
| 						{{if not (StringUtils.Contains (StringUtils.ToString $.Content) .UUID)}} | ||||
| 						{{if not (StringUtils.Contains (StringUtils.ToString $.RenderedContent) .UUID)}} | ||||
| 							{{$hasThumbnails = true}} | ||||
| 						{{end}} | ||||
| 						{{svg "octicon-file"}} | ||||
| @ -29,7 +29,7 @@ | ||||
| 		<div class="ui small thumbnails"> | ||||
| 			{{- range .Attachments -}} | ||||
| 				{{if FilenameIsImage .Name}} | ||||
| 					{{if not (StringUtils.Contains (StringUtils.ToString $.Content) .UUID)}} | ||||
| 					{{if not (StringUtils.Contains (StringUtils.ToString $.RenderedContent) .UUID)}} | ||||
| 					<a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}"> | ||||
| 						<img alt="{{.Name}}" src="{{.DownloadURL}}" title="{{ctx.Locale.Tr "repo.issues.attachment.open_tab" .Name}}"> | ||||
| 					</a> | ||||
|  | ||||
| @ -69,7 +69,7 @@ | ||||
| 						<div id="issuecomment-{{.ID}}-raw" class="raw-content gt-hidden">{{.Content}}</div> | ||||
| 						<div class="edit-content-zone gt-hidden" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div> | ||||
| 						{{if .Attachments}} | ||||
| 							{{template "repo/issue/view_content/attachments" dict "ctxData" $ "Attachments" .Attachments "Content" .RenderedContent}} | ||||
| 							{{template "repo/issue/view_content/attachments" dict "ctxData" $ "Attachments" .Attachments "RenderedContent" .RenderedContent}} | ||||
| 						{{end}} | ||||
| 					</div> | ||||
| 					{{$reactions := .Reactions.GroupByType}} | ||||
| @ -440,7 +440,7 @@ | ||||
| 							<div id="issuecomment-{{.ID}}-raw" class="raw-content gt-hidden">{{.Content}}</div> | ||||
| 							<div class="edit-content-zone gt-hidden" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div> | ||||
| 							{{if .Attachments}} | ||||
| 								{{template "repo/issue/view_content/attachments" dict "ctxData" $ "Attachments" .Attachments "Content" .RenderedContent}} | ||||
| 								{{template "repo/issue/view_content/attachments" dict "ctxData" $ "Attachments" .Attachments "RenderedContent" .RenderedContent}} | ||||
| 							{{end}} | ||||
| 						</div> | ||||
| 						{{$reactions := .Reactions.GroupByType}} | ||||
|  | ||||
| @ -95,7 +95,7 @@ | ||||
| 							<div id="issuecomment-{{.ID}}-raw" class="raw-content gt-hidden">{{.Content}}</div> | ||||
| 							<div class="edit-content-zone gt-hidden" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div> | ||||
| 							{{if .Attachments}} | ||||
| 								{{template "repo/issue/view_content/attachments" dict "ctxData" $ "Attachments" .Attachments "Content" .RenderedContent}} | ||||
| 								{{template "repo/issue/view_content/attachments" dict "ctxData" $ "Attachments" .Attachments "RenderedContent" .RenderedContent}} | ||||
| 							{{end}} | ||||
| 						</div> | ||||
| 						{{$reactions := .Reactions.GroupByType}} | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user