IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2113 from mattermost/slash-command-fixes

Browse Source 
Multiple minor slash command fixes
This commit is contained in:
Christopher Speller
2016-02-09 11:24:14 -05:00
parent 63f830938b 8ac0e800f1
commit a4cce1023c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/react/components/user_settings/user_settings_modal.jsx
View File

@@ -234,7 +234,7 @@ class UserSettingsModal extends React.Component {
tabs.push({name: 'developer', uiName: formatMessage(holders.developer), icon: 'glyphicon glyphicon-th'});
}
if (global.window.mm_config.EnableIncomingWebhooks === 'true' || global.window.mm_config.EnableOutgoingWebhooks === 'true') {
if (global.window.mm_config.EnableIncomingWebhooks === 'true' || global.window.mm_config.EnableOutgoingWebhooks === 'true' || global.window.mm_config.EnableCommands === 'true') {
tabs.push({name: 'integrations', uiName: formatMessage(holders.integrations), icon: 'glyphicon glyphicon-transfer'});
}
tabs.push({name: 'display', uiName: formatMessage(holders.display), icon: 'glyphicon glyphicon-eye-open'});

8
web/react/utils/async_client.jsx
View File

@@ -779,13 +779,19 @@ export function getSuggestedCommands(command, suggestionId, component) {
var matches = [];
data.forEach((cmd) => {
if (('/' + cmd.trigger).indexOf(command) === 0) {
let s = '/' + cmd.trigger;
if (cmd.auto_complete_hint && cmd.auto_complete_hint.length !== 0) {
s += ' ' + cmd.auto_complete_hint;
}
matches.push({
suggestion: '/' + cmd.trigger + ' ' + cmd.auto_complete_hint,
suggestion: s,
description: cmd.auto_complete_desc
});
}
});
matches = matches.sort((a, b) => a.suggestion.localeCompare(b.suggestion));
// pull out the suggested commands from the returned data
const terms = matches.map((suggestion) => suggestion.suggestion);