pro/im_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix disappearing [you] badge in topic members

Browse Source
This commit is contained in:
or-else
2020-04-15 15:55:40 +03:00
parent c0a3ba6a92
commit 52c1016b45
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/contact-list.jsx
+2 -2
View File
@@ -39,7 +39,7 @@ class ContactList extends React.Component {
/>); />);
} else { } else {
// Normal contact // 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 // If filter function is provided, filter out the items
// which don't satisfy the condition. // which don't satisfy the condition.
if (this.props.filterFunc && this.props.filter) { if (this.props.filterFunc && this.props.filter) {
@@ -60,7 +60,7 @@ class ContactList extends React.Component {
(this.props.topicSelected === key); (this.props.topicSelected === key);
const badges = []; const badges = [];
if (this.props.showMode) { if (this.props.showMode) {
if (key === this.props.myUserId) { if (key == this.props.myUserId) {
badges.push({name: formatMessage(messages.badge_you), color: 'green'}); badges.push({name: formatMessage(messages.badge_you), color: 'green'});
} }
if (c.acs && c.acs.isOwner()) { if (c.acs && c.acs.isOwner()) {
umd/index.dev.js
+2 -3
View File
@@ -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)); 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); titleEdit = formatMessage(messages.requested);
titleCompare = formatMessage(messages.granted); 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; break;
case 'given': case 'given':
@@ -6990,7 +6989,7 @@ class ContactList extends react__WEBPACK_IMPORTED_MODULE_0___default.a.Component
onAction: this.props.onAction onAction: this.props.onAction
})); }));
} else { } 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) { if (this.props.filterFunc && this.props.filter) {
let content = [key]; let content = [key];
@@ -7012,7 +7011,7 @@ class ContactList extends react__WEBPACK_IMPORTED_MODULE_0___default.a.Component
const badges = []; const badges = [];
if (this.props.showMode) { if (this.props.showMode) {
if (key === this.props.myUserId) { if (key == this.props.myUserId) {
badges.push({ badges.push({
name: formatMessage(messages.badge_you), name: formatMessage(messages.badge_you),
color: 'green' color: 'green'
umd/index.dev.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/index.prod.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/index.prod.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long