imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

disambiguate devices by ID in memberinfo

Browse source
This commit is contained in:
Matthew Hodgson 2016-09-17 20:12:56 +01:00
parent 6e57faecb0
commit 5fa5489bbd
2 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/views/rooms/MemberDeviceInfo.js
View file

@ -145,16 +145,17 @@ export default class MemberDeviceInfo extends React.Component {
);
}
var deviceName = this.props.device.getDisplayName() || this.props.device.deviceId;
var deviceName = this.props.device.ambiguous ?
(this.props.device.getDisplayName() ? this.props.device.getDisplayName() : "") + " (" + this.props.device.deviceId + ")" :
this.props.device.getDisplayName();
var info = (
<div className="mx_MemberDeviceInfo_deviceInfo" title={ "device id: " + this.props.device.deviceId }>
<div className="mx_MemberDeviceInfo_deviceInfo">
<div className="mx_MemberDeviceInfo_deviceId">{deviceName}{indicator}</div>
</div>
);
}
// add the deviceId as a titletext to help with debugging
return (
<div className="mx_MemberDeviceInfo">
{ info }