diff --git a/application/Espo/Resources/i18n/en_US/Integration.json b/application/Espo/Resources/i18n/en_US/Integration.json index 1001dc1dda..1020584ba1 100644 --- a/application/Espo/Resources/i18n/en_US/Integration.json +++ b/application/Espo/Resources/i18n/en_US/Integration.json @@ -6,7 +6,8 @@ "redirectUri": "Redirect URI" }, "messages": { - "selectIntegration": "Select an integration in menu." + "selectIntegration": "Select an integration from menu.", + "noIntegrations": "No Integrations is available." }, "help": { "Google": "

Obtain OAuth 2.0 credentials from the Google Developers Console.

Visit Google Developers Console to obtain OAuth 2.0 credentials such as a Client ID and Client Secret that are known to both Google and EspoCRM application.

" diff --git a/application/Espo/Resources/metadata/integrations/Google.json b/application/Espo/Resources/metadata/integrations/Google.json deleted file mode 100644 index e95bd623ac..0000000000 --- a/application/Espo/Resources/metadata/integrations/Google.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "fields": { - "clientId": { - "type": "varchar", - "maxLength": 255, - "required": true - }, - "clientSecret": { - "type": "varchar", - "maxLength": 255, - "required": true - } - }, - "params": { - "endpoint": "https://accounts.google.com/o/oauth2/auth", - "tokenEndpoint": "https://accounts.google.com/o/oauth2/token", - "scope": "https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/calendar" - }, - "allowUserAccounts": true, - "authMethod": "OAuth2", - "clientClassName": "\\Espo\\Core\\ExternalAccount\\Clients\\Google" -} diff --git a/frontend/client/src/views/admin/integrations/index.js b/frontend/client/src/views/admin/integrations/index.js index 0c85a80346..50027c8c0f 100644 --- a/frontend/client/src/views/admin/integrations/index.js +++ b/frontend/client/src/views/admin/integrations/index.js @@ -78,7 +78,12 @@ Espo.define('Views.Admin.Integrations.Index', 'View', function (Dep) { renderDefaultPage: function () { $('#integration-header').html('').hide(); - $('#integration-content').html(this.translate('selectIntegration', 'messages', 'Integration')); + if (this.integrationList.length) { + var msg = this.translate('selectIntegration', 'messages', 'Integration'); + } else { + var msg = '

' + this.translate('noIntegrations', 'messages', 'Integration') + '

'; + } + $('#integration-content').html(msg); }, renderHeader: function () {