From 9cc824d8526bfc6e7b1c5fe2c81fc75a04678d92 Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <i.kamalov@adguard.com>
Date: Thu, 23 May 2019 14:56:40 +0300
Subject: [PATCH] * client: show MAC address as default
---
.../src/components/Settings/Clients/index.js | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/client/src/components/Settings/Clients/index.js b/client/src/components/Settings/Clients/index.js
index 948252a0..526d8d57 100644
--- a/client/src/components/Settings/Clients/index.js
+++ b/client/src/components/Settings/Clients/index.js
@@ -46,7 +46,7 @@ class Clients extends Component {
}
return {
- identifier: 'ip',
+ identifier: CLIENT_ID.IP,
use_global_settings: true,
};
};
@@ -71,15 +71,7 @@ class Clients extends Component {
Header: this.props.t('table_client'),
accessor: 'ip',
Cell: (row) => {
- if (row.value) {
- return (
- <div className="logs__row logs__row--overflow">
- <span className="logs__text" title={row.value}>
- {row.value} <em>(IP)</em>
- </span>
- </div>
- );
- } else if (row.original && row.original.mac) {
+ if (row.original && row.original.mac) {
return (
<div className="logs__row logs__row--overflow">
<span className="logs__text" title={row.original.mac}>
@@ -87,6 +79,14 @@ class Clients extends Component {
</span>
</div>
);
+ } else if (row.value) {
+ return (
+ <div className="logs__row logs__row--overflow">
+ <span className="logs__text" title={row.value}>
+ {row.value} <em>(IP)</em>
+ </span>
+ </div>
+ );
}
return '';