daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1587-cache-settings

Browse Source
This commit is contained in:
ArtemBaskal
2020-07-03 22:30:56 +03:00
parent 0c4905fa2b 48f40d5f01
commit 7dd3d944e8
27 changed files with 313 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/Settings/Dhcp/index.js
View File

@@ -32,7 +32,7 @@ class Dhcp extends Component {
const {
config, check, processingDhcp, processingConfig,
} = this.props.dhcp;
const otherDhcpFound = check && check.otherServer
const otherDhcpFound = check?.otherServer
&& check.otherServer.found === DHCP_STATUS_RESPONSE.YES;
const filledConfig = Object.keys(config).every((key) => {
if (key === 'enabled' || key === 'icmp_timeout_msec') {