Fixes for creating teams (#4387)
Этот коммит содержится в:
коммит произвёл
Christopher Speller
родитель
1d4f42acd9
Коммит
6d3b3162b0
@@ -80,7 +80,7 @@ export default class ChannelNotificationsModal extends React.Component {
|
|||||||
}
|
}
|
||||||
createNotifyLevelSection(serverError) {
|
createNotifyLevelSection(serverError) {
|
||||||
// Get glabal user setting for notifications
|
// Get glabal user setting for notifications
|
||||||
const globalNotifyLevel = this.props.currentUser.notify_props.desktop;
|
const globalNotifyLevel = this.props.currentUser.notify_props ? this.props.currentUser.notify_props.desktop : 'all';
|
||||||
let globalNotifyLevelName;
|
let globalNotifyLevelName;
|
||||||
if (globalNotifyLevel === 'all') {
|
if (globalNotifyLevel === 'all') {
|
||||||
globalNotifyLevelName = (
|
globalNotifyLevelName = (
|
||||||
|
|||||||
@@ -27,11 +27,13 @@ export default class TeamUrl extends React.Component {
|
|||||||
isLoading: false
|
isLoading: false
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
submitBack(e) {
|
submitBack(e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
this.props.state.wizard = 'display_name';
|
this.props.state.wizard = 'display_name';
|
||||||
this.props.updateParent(this.props.state);
|
this.props.updateParent(this.props.state);
|
||||||
}
|
}
|
||||||
|
|
||||||
submitNext(e) {
|
submitNext(e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
||||||
|
|||||||
@@ -400,6 +400,7 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => {
|
|||||||
ChannelStore.resetCounts(currentId);
|
ChannelStore.resetCounts(currentId);
|
||||||
}
|
}
|
||||||
ChannelStore.setUnreadCountsByMembers(action.members);
|
ChannelStore.setUnreadCountsByMembers(action.members);
|
||||||
|
ChannelStore.emitChange();
|
||||||
break;
|
break;
|
||||||
case ActionTypes.RECEIVED_MORE_CHANNELS:
|
case ActionTypes.RECEIVED_MORE_CHANNELS:
|
||||||
ChannelStore.storeMoreChannels(action.channels);
|
ChannelStore.storeMoreChannels(action.channels);
|
||||||
|
|||||||
@@ -243,7 +243,7 @@ export function getMoreChannels(force) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function getChannelStats(channelId = ChannelStore.getCurrentId()) {
|
export function getChannelStats(channelId = ChannelStore.getCurrentId()) {
|
||||||
if (isCallInProgress('getChannelStats' + channelId)) {
|
if (isCallInProgress('getChannelStats' + channelId) || channelId == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user