Disable issue subscribe button for guest users (#4095)
* disabled the button itself, but added the tooltip to the form, because it didn't work for the button and likely has something to do with JS * added an integration test to verify the new logic ## Preview |Signed in|Guest| |-|-| |![](/attachments/b1441565-6aec-4a72-a28f-6383914c8918)|![](/attachments/839cc58e-18cf-4a5d-a9d7-f0e3e2556c98)| Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4095 Reviewed-by: Mai-Lapyst <mai-lapyst@noreply.codeberg.org>
This commit is contained in:
parent
187860bded
commit
367317af6c
4 changed files with 59 additions and 4 deletions
|
@ -1211,10 +1211,13 @@ fork_from_self = You cannot fork a repository you own.
|
||||||
fork_guest_user = Sign in to fork this repository.
|
fork_guest_user = Sign in to fork this repository.
|
||||||
watch_guest_user = Sign in to watch this repository.
|
watch_guest_user = Sign in to watch this repository.
|
||||||
star_guest_user = Sign in to star this repository.
|
star_guest_user = Sign in to star this repository.
|
||||||
unwatch = Unwatch
|
subscribe.issue.guest.tooltip = Sign in to subscribe to this issue.
|
||||||
|
subscribe.pull.guest.tooltip = Sign in to subscribe to this pull request.
|
||||||
|
|
||||||
watch = Watch
|
watch = Watch
|
||||||
unstar = Unstar
|
unwatch = Unwatch
|
||||||
star = Star
|
star = Star
|
||||||
|
unstar = Unstar
|
||||||
fork = Fork
|
fork = Fork
|
||||||
download_archive = Download repository
|
download_archive = Download repository
|
||||||
more_operations = More operations
|
more_operations = More operations
|
||||||
|
|
1
release-notes/8.0.0/4095.md
Normal file
1
release-notes/8.0.0/4095.md
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Disable Subscribe button for guest users.
|
|
@ -1,6 +1,13 @@
|
||||||
<form hx-boost="true" hx-sync="this:replace" hx-target="this" method="post" action="{{.Issue.Link}}/watch">
|
<form hx-boost="true" hx-sync="this:replace" hx-target="this" method="post" action="{{.Issue.Link}}/watch"
|
||||||
|
{{if not $.IsSigned}}
|
||||||
|
{{if $.Issue.IsPull}}
|
||||||
|
data-tooltip-content="{{ctx.Locale.Tr "repo.subscribe.pull.guest.tooltip"}}"
|
||||||
|
{{else}}
|
||||||
|
data-tooltip-content="{{ctx.Locale.Tr "repo.subscribe.issue.guest.tooltip"}}"
|
||||||
|
{{end}}
|
||||||
|
{{end}}>
|
||||||
<input type="hidden" name="watch" value="{{if $.IssueWatch.IsWatching}}0{{else}}1{{end}}">
|
<input type="hidden" name="watch" value="{{if $.IssueWatch.IsWatching}}0{{else}}1{{end}}">
|
||||||
<button class="fluid ui button">
|
<button class="fluid ui button {{if not $.IsSigned}}disabled{{end}}">
|
||||||
{{if $.IssueWatch.IsWatching}}
|
{{if $.IssueWatch.IsWatching}}
|
||||||
{{svg "octicon-mute" 16 "tw-mr-2"}}
|
{{svg "octicon-mute" 16 "tw-mr-2"}}
|
||||||
{{ctx.Locale.Tr "repo.issues.unsubscribe"}}
|
{{ctx.Locale.Tr "repo.issues.unsubscribe"}}
|
||||||
|
|
44
tests/integration/issue_subscribe_test.go
Normal file
44
tests/integration/issue_subscribe_test.go
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
// Copyright 2024 The Forgejo Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package integration
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"path"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestIssueSubscribe(t *testing.T) {
|
||||||
|
onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
|
||||||
|
session := emptyTestSession(t)
|
||||||
|
testIssueSubscribe(t, *session, true)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func testIssueSubscribe(t *testing.T, session TestSession, unavailable bool) {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
testIssue := "/user2/repo1/issues/1"
|
||||||
|
testPull := "/user2/repo1/pulls/2"
|
||||||
|
selector := ".issue-content-right .watching form"
|
||||||
|
|
||||||
|
resp := session.MakeRequest(t, NewRequest(t, "GET", path.Join(testIssue)), http.StatusOK)
|
||||||
|
area := NewHTMLParser(t, resp.Body).Find(selector)
|
||||||
|
tooltip, exists := area.Attr("data-tooltip-content")
|
||||||
|
assert.EqualValues(t, unavailable, exists)
|
||||||
|
if unavailable {
|
||||||
|
assert.EqualValues(t, "Sign in to subscribe to this issue.", tooltip)
|
||||||
|
}
|
||||||
|
|
||||||
|
resp = session.MakeRequest(t, NewRequest(t, "GET", path.Join(testPull)), http.StatusOK)
|
||||||
|
area = NewHTMLParser(t, resp.Body).Find(selector)
|
||||||
|
tooltip, exists = area.Attr("data-tooltip-content")
|
||||||
|
assert.EqualValues(t, unavailable, exists)
|
||||||
|
if unavailable {
|
||||||
|
assert.EqualValues(t, "Sign in to subscribe to this pull request.", tooltip)
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue