pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[GITEA] Disable the RSS feed in file view for non-branches

Browse source 
Files can have an RSS feed, but those only make sense when taken in the
context of a branch. There is no history to make a feed of on a tag or a
commit: they're static. Forgejo does not provide a feed for them for
this reason.

However, the file view on the web UI was offering a link to these
non-existent feeds. With this patch, it does that no longer, and only
provides a link when viewing the file in the context of a branch.

Fixes #2102.

Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
(cherry picked from commit 4b48d21ea7459539dfb1ca5cadd6f9cb99e65fc7)
(cherry picked from commit 70cb2667603bcdb9a8c9bb20c482877ab3f6de39)
(cherry picked from commit 69b45c3feaf92454853ef9b02c9d75092780dabf)

Conflicts:
	options/locale/locale_en-US.ini
	https://codeberg.org/forgejo/forgejo/pulls/2249
(cherry picked from commit 639a2c07411e6c606dfb81f695fddbad73dca3da)
This commit is contained in:
Gergely Nagy 2024-01-06 10:06:17 +01:00 committed by Earl Warren
parent 2e172b3c9c
commit 9809f96a4a
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 43 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
templates/repo/view_file.tmpl
View file

@ -59,9 +59,15 @@
<a download href="{{$.RawFileLink}}"><span class="btn-octicon" data-tooltip-content="{{ctx.Locale.Tr "repo.download_file"}}">{{svg "octicon-download"}}</span></a>
<a id="copy-content" class="btn-octicon {{if not .CanCopyContent}} disabled{{end}}"{{if or .IsImageFile (and .HasSourceRenderedToggle (not .IsDisplayingSource))}} data-link="{{$.RawFileLink}}"{{end}} data-tooltip-content="{{if .CanCopyContent}}{{ctx.Locale.Tr "copy_content"}}{{else}}{{ctx.Locale.Tr "copy_type_unsupported"}}{{end}}">{{svg "octicon-copy" 14}}</a>
{{if .EnableFeed}}
<a class="btn-octicon" href="{{$.FeedURL}}/rss/{{$.BranchNameSubURL}}/{{PathEscapeSegments .TreePath}}" data-tooltip-content="{{ctx.Locale.Tr "rss_feed"}}">
{{svg "octicon-rss" 14}}
</a>
{{if .IsViewBranch}}
<a class="btn-octicon" href="{{$.FeedURL}}/rss/{{$.BranchNameSubURL}}/{{PathEscapeSegments .TreePath}}" data-tooltip-content="{{ctx.Locale.Tr "rss_feed"}}">
{{svg "octicon-rss" 14}}
</a>
{{else}}
<span class="btn-octicon disabled" data-tooltip-content="{{ctx.Locale.Tr "repo.rss.must_be_on_branch"}}">
{{svg "octicon-rss" 14}}
</span>
{{end}}
{{end}}
{{if .Repository.CanEnableEditor}}
{{if .CanEditFile}}

34
tests/integration/repo_test.go
View file

@ -407,6 +407,40 @@ func TestViewFileInRepo(t *testing.T) {
assert.EqualValues(t, 0, repoSummary.Length())
}
func TestViewFileInRepoRSSFeed(t *testing.T) {
defer tests.PrepareTestEnv(t)()
hasFileRSSFeed := func(t *testing.T, ref string) bool {
t.Helper()
req := NewRequestf(t, "GET", "/user2/repo1/src/%s/README.md", ref)
resp := MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
fileFeed := htmlDoc.doc.Find(`a[href*="/user2/repo1/rss/"]`)
return fileFeed.Length() != 0
}
t.Run("branch", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()
assert.True(t, hasFileRSSFeed(t, "branch/master"))
})
t.Run("tag", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()
assert.False(t, hasFileRSSFeed(t, "tag/v1.1"))
})
t.Run("commit", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()
assert.False(t, hasFileRSSFeed(t, "commit/65f1bf27bc3bf70f64657658635e66094edbcb4d"))
})
}
// TestBlameFileInRepo repo description, topics and summary should not be displayed when running blame on a file
func TestBlameFileInRepo(t *testing.T) {
defer tests.PrepareTestEnv(t)()