fixes for inviting/blocking users

This commit is contained in:
or-else
2019-02-27 15:22:35 +03:00
parent 173d153b82
commit 93e6d388b6
9 changed files with 137 additions and 82 deletions
+14 -6
View File
@@ -4,6 +4,7 @@ import ReactDOM from 'react-dom';
import { injectIntl, defineMessages } from 'react-intl';
import { REM_SIZE } from '../config.js';
import HashNavigation from '../lib/navigation.js';
const messages = defineMessages({
info: {
@@ -126,12 +127,17 @@ class ContextMenu extends React.Component {
'topic_unblock': {
id: 'topic_unblock',
title: formatMessage(messages.unblock),
handler: this.topicPermissionSetter.bind(this, '+J')
handler: this.topicPermissionSetter.bind(this, '+JP')
},
'topic_block': {
id: 'topic_block',
title: formatMessage(messages.block),
handler: this.topicPermissionSetter.bind(this, '-J')
handler: (params, errorHandler) => {
return this.topicPermissionSetter('-JP', params, errorHandler).then((ctrl) => {
this.props.onTopicRemoved(params.topicName);
return ctrl;
});
}
},
'topic_delete': {
id: 'topic_delete',
@@ -302,11 +308,13 @@ class ContextMenu extends React.Component {
am = topic.getAccessMode().updateWant(mode).getWant();
}
return topic.setMeta({sub: {user: params.user, mode: am}}).catch((err) => {
if (errorHandler) {
let result = topic.setMeta({sub: {user: params.user, mode: am}});
if (errorHandler) {
result = result.catch((err) => {
errorHandler(err.message, 'err');
}
});
});
}
return result;
}
render() {
+1 -1
View File
@@ -35,7 +35,7 @@ class ReceivedMarker extends React.PureComponent {
if (this.props.received <= Tinode.MESSAGE_STATUS_SENDING) {
marker = (<i className="material-icons small">access_time</i>); // watch face
} else if (this.props.received == Tinode.MESSAGE_STATUS_FAILED) {
marker = (<i className="material-icons small red">error_outline</i>); // icon (!)
marker = (<i className="material-icons small amber">warning</i>); // yellow icon /!\
} else if (this.props.received == Tinode.MESSAGE_STATUS_SENT) {
marker = (<i className="material-icons small">done</i>); // checkmark
} else if (this.props.received == Tinode.MESSAGE_STATUS_RECEIVED) {