* Fix save teams dispatch

* Fix login when MFA is enabled but not active

* Fix JS error caused by using deleted team member
Этот коммит содержится в:
Joram Wilander
2017-04-26 11:07:19 -04:00
коммит произвёл GitHub
родитель 8e6141152b
Коммит 1fef5bf5fe
3 изменённых файлов: 8 добавлений и 3 удалений

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

@@ -631,7 +631,7 @@ export function checkMfa(loginId, success, error) {
checkMfaRedux(loginId)(dispatch, getState).then( checkMfaRedux(loginId)(dispatch, getState).then(
(data) => { (data) => {
if (data && success) { if (data != null && success) {
success(data); success(data);
} else if (data == null && error) { } else if (data == null && error) {
const serverError = getState().requests.users.checkMfa.error; const serverError = getState().requests.users.checkMfa.error;

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

@@ -102,6 +102,9 @@ export default class TeamSidebar extends React.Component {
for (const index in this.state.teamMembers) { for (const index in this.state.teamMembers) {
if (this.state.teamMembers.hasOwnProperty(index)) { if (this.state.teamMembers.hasOwnProperty(index)) {
const teamMember = this.state.teamMembers[index]; const teamMember = this.state.teamMembers[index];
if (teamMember.delete_at > 0) {
continue;
}
const teamId = teamMember.team_id; const teamId = teamMember.team_id;
myTeams.push(Object.assign({ myTeams.push(Object.assign({
unread: teamMember.msg_count > 0, unread: teamMember.msg_count > 0,

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

@@ -185,12 +185,14 @@ class TeamStoreClass extends EventEmitter {
} }
saveTeam(team) { saveTeam(team) {
this.saveTeams([team]); const teams = {};
teams[team.id] = team;
this.saveTeams(teams);
} }
saveTeams(teams) { saveTeams(teams) {
store.dispatch({ store.dispatch({
type: TeamTypes.RECEIVED_TEAMS_LIST, type: TeamTypes.RECEIVED_TEAMS,
data: teams data: teams
}); });
} }