fix disappearing [you] badge in topic members
This commit is contained in:
@@ -39,7 +39,7 @@ class ContactList extends React.Component {
|
||||
/>);
|
||||
} else {
|
||||
// Normal contact
|
||||
const key = c.topic ? c.topic : c.user;
|
||||
const key = this.props.showMode ? c.user : (c.topic || c.user);
|
||||
// If filter function is provided, filter out the items
|
||||
// which don't satisfy the condition.
|
||||
if (this.props.filterFunc && this.props.filter) {
|
||||
@@ -60,7 +60,7 @@ class ContactList extends React.Component {
|
||||
(this.props.topicSelected === key);
|
||||
const badges = [];
|
||||
if (this.props.showMode) {
|
||||
if (key === this.props.myUserId) {
|
||||
if (key == this.props.myUserId) {
|
||||
badges.push({name: formatMessage(messages.badge_you), color: 'green'});
|
||||
}
|
||||
if (c.acs && c.acs.isOwner()) {
|
||||
|
||||
+2
-3
@@ -2198,7 +2198,6 @@ class InfoView extends react__WEBPACK_IMPORTED_MODULE_0___default.a.Component {
|
||||
toSkip = this.state.owner ? 'O' : tinode_sdk__WEBPACK_IMPORTED_MODULE_2___default.a.AccessMode.encode(tinode_sdk__WEBPACK_IMPORTED_MODULE_2___default.a.AccessMode.diff('ASDO', this.state.modeGiven));
|
||||
titleEdit = formatMessage(messages.requested);
|
||||
titleCompare = formatMessage(messages.granted);
|
||||
console.log("To skip", this.state.modeGiven, 'ASDO', tinode_sdk__WEBPACK_IMPORTED_MODULE_2___default.a.AccessMode.encode(tinode_sdk__WEBPACK_IMPORTED_MODULE_2___default.a.AccessMode.diff('ASDO', this.state.modeGiven)));
|
||||
break;
|
||||
|
||||
case 'given':
|
||||
@@ -6990,7 +6989,7 @@ class ContactList extends react__WEBPACK_IMPORTED_MODULE_0___default.a.Component
|
||||
onAction: this.props.onAction
|
||||
}));
|
||||
} else {
|
||||
const key = c.topic ? c.topic : c.user;
|
||||
const key = this.props.showMode ? c.user : c.topic || c.user;
|
||||
|
||||
if (this.props.filterFunc && this.props.filter) {
|
||||
let content = [key];
|
||||
@@ -7012,7 +7011,7 @@ class ContactList extends react__WEBPACK_IMPORTED_MODULE_0___default.a.Component
|
||||
const badges = [];
|
||||
|
||||
if (this.props.showMode) {
|
||||
if (key === this.props.myUserId) {
|
||||
if (key == this.props.myUserId) {
|
||||
badges.push({
|
||||
name: formatMessage(messages.badge_you),
|
||||
color: 'green'
|
||||
|
||||
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user