Disable `Test Delivery` and `Replay` webhook buttons when webhook is inactive (#27211)

These buttons are now disabled when the webhook is not active.

The buttons were always enabled before this change.

- Fixes #26824
- Replaces #26814

# Before

![image](https://github.com/go-gitea/gitea/assets/20454870/e783d0d8-b433-440e-b95f-50d7c42613d3)

![image](https://github.com/go-gitea/gitea/assets/20454870/b4886151-9f32-4e83-8001-dd3f20c23d70)

# After

![image](https://github.com/go-gitea/gitea/assets/20454870/74b76a72-0818-4143-8548-5d42c4119a05)

![image](https://github.com/go-gitea/gitea/assets/20454870/d5ae4e5c-c1ac-4751-a072-e6f7511b1e07)

Signed-off-by: Yarden Shoham <git@yardenshoham.com>

authored by

Yarden Shoham and committed by

GitHub 2 years ago e6d8b146 65d0b7c1

+10 -2

2 changed files

expand all

options

locale

locale_en-US.ini

templates

repo

settings

webhook

history.tmpl

options/locale/locale_en-US.ini

··· 2133 2133 settings.webhook_deletion_success = The webhook has been removed. 2134 2134 settings.webhook.test_delivery = Test Delivery 2135 2135 settings.webhook.test_delivery_desc = Test this webhook with a fake event. 2136 + settings.webhook.test_delivery_desc_disabled = To test this webhook with a fake event, activate it. 2136 2137 settings.webhook.request = Request 2137 2138 settings.webhook.response = Response 2138 2139 settings.webhook.headers = Headers 2139 2140 settings.webhook.payload = Content 2140 2141 settings.webhook.body = Body 2141 2142 settings.webhook.replay.description = Replay this webhook. 2143 + settings.webhook.replay.description_disabled = To replay this webhook, activate it. 2142 2144 settings.webhook.delivery.success = An event has been added to the delivery queue. It may take few seconds before it shows up in the delivery history. 2143 2145 settings.githooks_desc = "Git Hooks are powered by Git itself. You can edit hook files below to set up custom operations." 2144 2146 settings.githook_edit_desc = If the hook is inactive, sample content will be presented. Leaving content to an empty value will disable this hook.

+8 -2

templates/repo/settings/webhook/history.tmpl

··· 1 + {{$isNew:=or .PageIsSettingsHooksNew .PageIsAdminDefaultHooksNew .PageIsAdminSystemHooksNew}} 1 2 {{if .PageIsSettingsHooksEdit}} 2 3 <h4 class="ui top attached header"> 3 4 {{.locale.Tr "repo.settings.recent_deliveries"}} 4 5 {{if .Permission.IsAdmin}} 5 6 <div class="ui right"> 6 - <button class="ui teal tiny button" id="test-delivery" data-tooltip-content="{{.locale.Tr "repo.settings.webhook.test_delivery_desc"}}" data-link="{{.Link}}/test" data-redirect="{{.Link}}">{{.locale.Tr "repo.settings.webhook.test_delivery"}}</button> 7 +  8 + <span data-tooltip-content="{{if or $isNew .Webhook.IsActive}}{{.locale.Tr "repo.settings.webhook.test_delivery_desc"}}{{else}}{{.locale.Tr "repo.settings.webhook.test_delivery_desc_disabled"}}{{end}}"> 9 + <button class="ui teal tiny button{{if not (or $isNew .Webhook.IsActive)}} disabled{{end}}" id="test-delivery" data-link="{{.Link}}/test" data-redirect="{{.Link}}">{{.locale.Tr "repo.settings.webhook.test_delivery"}}</button> 10 + </span> 7 11 </div> 8 12 {{end}} 9 13 </h4> ··· 43 47 <div class="right menu"> 44 48 <form class="item" action="{{$.Link}}/replay/{{.UUID}}" method="post"> 45 49 {{$.CsrfTokenHtml}} 46 - <button class="ui tiny button" data-tooltip-content="{{$.locale.Tr "repo.settings.webhook.replay.description"}}">{{svg "octicon-sync"}}</button> 50 + <span data-tooltip-content="{{if $.Webhook.IsActive}}{{$.locale.Tr "repo.settings.webhook.replay.description"}}{{else}}{{$.locale.Tr "repo.settings.webhook.replay.description_disabled"}}{{end}}"> 51 + <button class="ui tiny button{{if not $.Webhook.IsActive}} disabled{{end}}">{{svg "octicon-sync"}}</button> 52 + </span> 47 53 </form> 48 54 </div> 49 55 {{end}}

Configure Feed

Configure Feed