Merge pull request #2250 from ZBoxApp/fix-deactivate

PLT-2123 Member show on Activate and Hide on deactivate from channel member li…
Этот коммит содержится в:
Christopher Speller
2016-02-25 14:22:09 -05:00
родитель 34e6f10f22 25d599747e
Коммит a7f8af528d
6 изменённых файлов: 95 добавлений и 1 удалений

Просмотреть файл

@@ -2,6 +2,7 @@
// See License.txt for license information.
import UserStore from '../stores/user_store.jsx';
import ChannelStore from '../stores/channel_store.jsx';
import * as Client from '../utils/client.jsx';
import * as AsyncClient from '../utils/async_client.jsx';
import * as Utils from '../utils/utils.jsx';
@@ -71,6 +72,7 @@ export default class MemberListTeamItem extends React.Component {
Client.updateActive(this.props.user.id, true,
() => {
AsyncClient.getProfiles();
AsyncClient.getChannelExtraInfo(ChannelStore.getCurrentId());
},
(err) => {
this.setState({serverError: err.message});
@@ -81,6 +83,7 @@ export default class MemberListTeamItem extends React.Component {
Client.updateActive(this.props.user.id, false,
() => {
AsyncClient.getProfiles();
AsyncClient.getChannelExtraInfo(ChannelStore.getCurrentId());
},
(err) => {
this.setState({serverError: err.message});

Просмотреть файл

@@ -83,7 +83,7 @@ export default class AtMentionProvider {
if (captured) {
const usernamePrefix = captured[1];
const users = UserStore.getProfiles();
const users = UserStore.getActiveOnlyProfiles(true);
let filtered = [];
for (const id of Object.keys(users)) {