Merge branch 'master' into develop
This commit is contained in:
commit
dd0ffa8e72
4 changed files with 47 additions and 7 deletions
|
@ -643,7 +643,11 @@ module.exports = createReactClass({
|
|||
_calculateOpsPermissions: async function(member) {
|
||||
let canDeactivate = false;
|
||||
if (this.context.matrixClient) {
|
||||
canDeactivate = await this.context.matrixClient.isSynapseAdministrator();
|
||||
try {
|
||||
canDeactivate = await this.context.matrixClient.isSynapseAdministrator();
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
}
|
||||
}
|
||||
|
||||
const defaultPerms = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue