From 28e098832578f291e17bfd9d884880c7373e0fc0 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 29 Oct 2019 14:26:35 -0600 Subject: [PATCH] Fix naming of integrationProvisioning --- src/settings/Settings.js | 2 +- src/settings/handlers/AccountSettingsHandler.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/settings/Settings.js b/src/settings/Settings.js index 586ec7d1cf..54446a467b 100644 --- a/src/settings/Settings.js +++ b/src/settings/Settings.js @@ -279,7 +279,7 @@ export const SETTINGS = { supportedLevels: ['account'], default: [], }, - "integration_provisioning": { + "integrationProvisioning": { supportedLevels: ['account'], default: true, }, diff --git a/src/settings/handlers/AccountSettingsHandler.js b/src/settings/handlers/AccountSettingsHandler.js index 7f05dc22c6..f738bf7971 100644 --- a/src/settings/handlers/AccountSettingsHandler.js +++ b/src/settings/handlers/AccountSettingsHandler.js @@ -65,7 +65,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa this._notifyBreadcrumbsUpdate(event); } else if (event.getType() === INTEG_PROVISIONING_EVENT_TYPE) { const val = event.getContent()['enabled']; - this._watchers.notifyUpdate("integration_provisioning", null, SettingLevel.ACCOUNT, val); + this._watchers.notifyUpdate("integrationProvisioning", null, SettingLevel.ACCOUNT, val); } } @@ -93,7 +93,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa } // Special case integration manager provisioning - if (settingName === "integration_provisioning") { + if (settingName === "integrationProvisioning") { const content = this._getSettings(INTEG_PROVISIONING_EVENT_TYPE); return content ? content['enabled'] : null; } @@ -132,7 +132,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa } // Special case integration manager provisioning - if (settingName === "integration_provisioning") { + if (settingName === "integrationProvisioning") { const content = this._getSettings(INTEG_PROVISIONING_EVENT_TYPE) || {}; content['enabled'] = newValue; return MatrixClientPeg.get().setAccountData(INTEG_PROVISIONING_EVENT_TYPE, content);