OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #409 from matrix-org/rav/device_panel_stuff 

Add device_id to devices display
pull/21833/head
David Baker 2016-08-12 10:43:44 +01:00 committed by GitHub
parent 5f61464195 55a28564b9
commit cb905dbaef
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/views/settings/DevicesPanel.js
View File

@ -52,7 +52,7 @@ export default class DevicesPanel extends React.Component {
(error) => {
if (this._unmounted) { return; }
var errtxt;
if (err.httpStatus == 404) {
if (error.httpStatus == 404) {
// 404 probably means the HS doesn't yet support the API.
errtxt = "Your home server does not support device management.";
} else {
@ -127,6 +127,7 @@ export default class DevicesPanel extends React.Component {
return (
<div className={classes}>
<div className="mx_DevicesPanel_header">
<div className="mx_DevicesPanel_deviceId">ID</div>
<div className="mx_DevicesPanel_deviceName">Name</div>
<div className="mx_DevicesPanel_deviceLastSeen">Last seen</div>
<div className="mx_DevicesPanel_deviceButtons"></div>

3
src/components/views/settings/DevicesPanelEntry.js
View File

@ -109,6 +109,9 @@ export default class DevicesPanelEntry extends React.Component {
return (
<div className="mx_DevicesPanel_device">
<div className="mx_DevicesPanel_deviceId">
{device.device_id}
</div>
<div className="mx_DevicesPanel_deviceName">
<EditableTextContainer initialValue={device.display_name}
onSubmit={this._onDisplayNameChanged}