diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-09-04 21:11:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-04 21:11:41 +0300 |
| commit | bfbe32e1ec945e883a5d0dbf52c5554d8908d995 (patch) | |
| tree | 5a938aed02c398b6b11a60505a3c85746ed54441 /client/components/settings | |
| parent | ccfaf879dd4ea0c24d2fed34131be5ad151bb28c (diff) | |
| parent | 510407467c5245f13fb9508b6e95f6b490dcd36b (diff) | |
| download | wekan-bfbe32e1ec945e883a5d0dbf52c5554d8908d995.tar.gz wekan-bfbe32e1ec945e883a5d0dbf52c5554d8908d995.tar.bz2 wekan-bfbe32e1ec945e883a5d0dbf52c5554d8908d995.zip | |
Merge pull request #2665 from whowillcare/master
Add Feature: complete the original author's webhook functions and add two-way webhook type
Diffstat (limited to 'client/components/settings')
| -rw-r--r-- | client/components/settings/settingBody.jade | 8 | ||||
| -rw-r--r-- | client/components/settings/settingBody.js | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/client/components/settings/settingBody.jade b/client/components/settings/settingBody.jade index 8eb584dc..04b635e8 100644 --- a/client/components/settings/settingBody.jade +++ b/client/components/settings/settingBody.jade @@ -18,6 +18,8 @@ template(name="setting") a.js-setting-menu(data-id="announcement-setting") {{_ 'admin-announcement'}} li a.js-setting-menu(data-id="layout-setting") {{_ 'layout'}} + li + a.js-setting-menu(data-id="webhook-setting") {{_ 'global-webhook'}} .main-body if loading.get +spinner @@ -31,6 +33,12 @@ template(name="setting") +announcementSettings else if layoutSetting.get +layoutSettings + else if webhookSetting.get + +webhookSettings + +template(name="webhookSettings") + span + +outgoingWebhooksPopup template(name="general") ul#registration-setting.setting-detail diff --git a/client/components/settings/settingBody.js b/client/components/settings/settingBody.js index f9b5c08d..4ff5aedd 100644 --- a/client/components/settings/settingBody.js +++ b/client/components/settings/settingBody.js @@ -7,11 +7,13 @@ BlazeComponent.extendComponent({ this.accountSetting = new ReactiveVar(false); this.announcementSetting = new ReactiveVar(false); this.layoutSetting = new ReactiveVar(false); + this.webhookSetting = new ReactiveVar(false); Meteor.subscribe('setting'); Meteor.subscribe('mailServer'); Meteor.subscribe('accountSettings'); Meteor.subscribe('announcements'); + Meteor.subscribe('globalwebhooks'); }, setError(error) { @@ -83,6 +85,7 @@ BlazeComponent.extendComponent({ this.accountSetting.set('account-setting' === targetID); this.announcementSetting.set('announcement-setting' === targetID); this.layoutSetting.set('layout-setting' === targetID); + this.webhookSetting.set('webhook-setting' === targetID); } }, |