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

Fix postgres query and minor UI updates for outgoing webhooks.

Browse Source
This commit is contained in:
JoramWilander
2015-10-02 08:14:31 -04:00
parent ba3cde024f
commit 5574151c85
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
store/sql_webhook_store.go
View File

@@ -256,7 +256,7 @@ func (s SqlWebhookStore) GetOutgoingByTriggerWord(teamId, channelId, triggerWord
WHERE
DeleteAt = 0
AND TeamId = $1
AND $2 LIKE '%' || TriggerWords || '%'`
AND TriggerWords LIKE '%' || $2 || '%'`
if len(channelId) != 0 {
searchQuery += " AND (ChannelId = $3 OR ChannelId = '')"

13
web/react/components/user_settings/manage_outgoing_hooks.jsx
View File

@@ -39,12 +39,12 @@ export default class ManageOutgoingHooks extends React.Component {
Client.addOutgoingHook(
hook,
(data) => {
let hooks = this.state.hooks;
let hooks = Object.assign([], this.state.hooks);
if (!hooks) {
hooks = [];
}
hooks.push(data);
this.setState({hooks, serverError: null});
this.setState({hooks, serverError: null, channelId: '', triggerWords: '', callbackURLs: ''});
},
(err) => {
this.setState({serverError: err});
@@ -93,7 +93,7 @@ export default class ManageOutgoingHooks extends React.Component {
}
}
this.setState({hooks});
this.setState({hooks, serverError: null});
},
(err) => {
this.setState({serverError: err});
@@ -103,14 +103,9 @@ export default class ManageOutgoingHooks extends React.Component {
getHooks() {
Client.listOutgoingHooks(
(data) => {
const state = this.state;
if (data) {
state.hooks = data;
this.setState({hooks: data, getHooksComplete: true, serverError: null});
}
state.getHooksComplete = true;
this.setState(state);
},
(err) => {
this.setState({serverError: err});

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

@@ -20,6 +20,8 @@ export default class UserSettingsIntegrationsTab extends React.Component {
}
handleClose() {
this.updateSection('');
$('.ps-container.modal-body').scrollTop(0);
$('.ps-container.modal-body').perfectScrollbar('update');
}
componentDidMount() {
$('#user_settings').on('hidden.bs.modal', this.handleClose);