a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

client: 2368 Allow to enable DHCP even if there's another DHCP found on the network 

Squashed commit of the following:

commit 2411b36b07b263c9a752f17f676bae93c15e430d
Merge: 8b8740fd3 88d44b437
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Tue Dec 8 14:11:15 2020 +0300

    Merge branch 'master' into fix/2368

commit 8b8740fd3f379ed1b17c3da27c748df9238efc77
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Mon Dec 7 16:51:45 2020 +0300

    + client: 2368 Allow to enable DHCP even if there's another DHCP found on the network
This commit is contained in:
Artem Baskal 2020-12-08 14:26:44 +03:00
parent 88d44b4370
commit 6aacb2105c
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,9 +113,6 @@ const Dhcp = () => {
const enteredSomeValue = enteredSomeV4Value || enteredSomeV6Value || interfaceName; const enteredSomeValue = enteredSomeV4Value || enteredSomeV6Value || interfaceName;
const getToggleDhcpButton = () => { const getToggleDhcpButton = () => {
const otherDhcpFound = check && (check.v4.other_server.found === STATUS_RESPONSE.YES
|| check.v6.other_server.found === STATUS_RESPONSE.YES);
const filledConfig = interface_name && (Object.values(v4) const filledConfig = interface_name && (Object.values(v4)
.every(Boolean) || Object.values(v6) .every(Boolean) || Object.values(v6)
.every(Boolean)); .every(Boolean));
@ -141,7 +138,7 @@ const Dhcp = () => {
className={className} className={className}
onClick={enabled ? onClickDisable : onClickEnable} onClick={enabled ? onClickDisable : onClickEnable}
disabled={processingDhcp || processingConfig disabled={processingDhcp || processingConfig
|| (!enabled && (!filledConfig || !check || otherDhcpFound))} || (!enabled && (!filledConfig || !check))}
> >
<Trans>{enabled ? 'dhcp_disable' : 'dhcp_enable'}</Trans> <Trans>{enabled ? 'dhcp_disable' : 'dhcp_enable'}</Trans>
</button>; </button>;