PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2017-11-07 22:46:15 +00:00
commit a79a687e59
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/groups/GroupMemberTile.js
View file

@ -63,7 +63,7 @@ export default withMatrixClient(React.createClass({
return ( return (
<EntityTile name={name} avatarJsx={av} onClick={this.onClick} <EntityTile name={name} avatarJsx={av} onClick={this.onClick}
suppressOnHover={true} presenceState="online" suppressOnHover={true} presenceState="online"
powerStatus={this.props.member.isAdmin ? EntityTile.POWER_STATUS_ADMIN : null} powerStatus={this.props.member.isPrivileged ? EntityTile.POWER_STATUS_ADMIN : null}
/> />
); );
}, },

2
src/groups.js
View file

@ -36,7 +36,7 @@ export function groupMemberFromApiObject(apiObject) {
userId: apiObject.user_id, userId: apiObject.user_id,
displayname: apiObject.displayname, displayname: apiObject.displayname,
avatarUrl: apiObject.avatar_url, avatarUrl: apiObject.avatar_url,
isAdmin: apiObject.is_admin, isPrivileged: apiObject.is_privileged,
}; };
} }