diff options
| author | 蔡仲明 (Romulus Urakagi Tsai) <urakagi@gmail.com> | 2019-11-21 11:25:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-21 11:25:56 +0800 |
| commit | 3e0bedd8c7a6dec97352212adb1cbde1ade44190 (patch) | |
| tree | 651ff30d25ddb0416444370368d699e597c142d7 /client/components/settings | |
| parent | 9bbeb73db1cd0ce1caaaca8dfb14ea92131bbf9d (diff) | |
| parent | 4f5de87cc4c2281bd576548693de7c94e6a988c6 (diff) | |
| download | wekan-3e0bedd8c7a6dec97352212adb1cbde1ade44190.tar.gz wekan-3e0bedd8c7a6dec97352212adb1cbde1ade44190.tar.bz2 wekan-3e0bedd8c7a6dec97352212adb1cbde1ade44190.zip | |
Merge pull request #1 from wekan/master
Update master
Diffstat (limited to 'client/components/settings')
| -rw-r--r-- | client/components/settings/peopleBody.js | 4 | ||||
| -rw-r--r-- | client/components/settings/settingBody.jade | 8 | ||||
| -rw-r--r-- | client/components/settings/settingBody.js | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/client/components/settings/peopleBody.js b/client/components/settings/peopleBody.js index a9f2247c..8610034e 100644 --- a/client/components/settings/peopleBody.js +++ b/client/components/settings/peopleBody.js @@ -17,7 +17,7 @@ BlazeComponent.extendComponent({ this.autorun(() => { const limit = this.page.get() * usersPerPage; - this.subscribe('people', limit, () => { + this.subscribe('people', this.findUsersOptions.get(), limit, () => { this.loadNextPageLocked = false; const nextPeakBefore = this.callFirstWith(null, 'getNextPeak'); this.calculateNextPeak(); @@ -85,7 +85,7 @@ BlazeComponent.extendComponent({ const users = Users.find(this.findUsersOptions.get(), { fields: { _id: true }, }); - this.number.set(users.count()); + this.number.set(users.count(false)); return users; }, peopleNumber() { 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); } }, |