Переглянути джерело

[slack] Enable share_from_editor only when Slack is_enabled (#2199)

Harsh Gupta 4 роки тому
батько
коміт
158d2a6d65

+ 4 - 1
desktop/core/src/desktop/js/apps/editor/components/ko.snippetEditorActions.js

@@ -157,7 +157,10 @@ class SnippetEditorActions {
       description: ''
     });
 
-    const slackChannels = await apiHelper.getSlackChannelsAsync();
+    let slackChannels = '';
+    if (window.SHARE_TO_SLACK) {
+      slackChannels = await apiHelper.getSlackChannelsAsync();
+    }
 
     huePubSub.publish(SHOW_GIST_MODAL_EVENT, { link: gistLink, channels: slackChannels });
   }

+ 1 - 1
desktop/core/src/desktop/templates/global_js_constants.mako

@@ -120,7 +120,7 @@
   window.AUTO_UPLOAD_SQL_ANALYZER_STATS = '${ OPTIMIZER.AUTO_UPLOAD_STATS.get() }' === 'True';
 
   window.HAS_GIST = '${ ENABLE_GIST.get() }' === 'True';
-  window.SHARE_TO_SLACK = '${ conf.SLACK.SHARE_FROM_EDITOR.get() }' === 'True';
+  window.SHARE_TO_SLACK = '${ conf.SLACK.SHARE_FROM_EDITOR.get() }' === 'True' && '${ conf.SLACK.IS_ENABLED.get() }' === 'True';
   window.HAS_LINK_SHARING = '${ ENABLE_LINK_SHARING.get() }' === 'True';
   window.HAS_CONNECTORS = '${ has_connectors() }' === 'True';