github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 08:41:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Don't display webhooks for inactive plugins (#9206)

Browse Source 
* FIX: Don't display webhooks for inactive plugins

This commit ensures that we don't show webhooks for plugins that are not
installed or that are disabled.

Bug report:

https://meta.discourse.org/t/webhookeventtype-and-the-solved-and-assign-plugins/144180

* rename to just 'active', it's cleaner
This commit is contained in:
Blake Erickson
2020-03-17 10:39:24 -06:00
committed by GitHub
parent e950471c0f
commit 919e405c48
3 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/web_hooks_controller.rb
View File

@ -16,7 +16,7 @@ class Admin::WebHooksController < Admin::AdminController
json = {
web_hooks: serialize_data(web_hooks, AdminWebHookSerializer),
extras: {
event_types: WebHookEventType.all,
event_types: WebHookEventType.active,
default_event_types: WebHook.default_event_types,
content_types: WebHook.content_types.map { |name, id| { id: id, name: name } },
delivery_statuses: WebHook.last_delivery_statuses.map { |name, id| { id: id, name: name.to_s } },